Ros-diffs

ros-diffs@reactos.org

81390 discussions

[cgutman] 35298: - Revert r35279 due to some odd problems with UnlockBuffers when completing
by cgutman＠svn.reactos.org 13 Aug '08

13 Aug '08

Author: cgutman Date: Tue Aug 12 23:40:39 2008 New Revision: 35298 URL: http://svn.reactos.org/svn/reactos?rev=35298&view=rev Log: - Revert r35279 due to some odd problems with UnlockBuffers when completing Modified: branches/aicom-network-fixes/drivers/network/afd/afd/read.c branches/aicom-network-fixes/drivers/network/afd/afd/write.c Modified: branches/aicom-network-fixes/drivers/network/afd/afd/read.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/afd/afd/read.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/afd/afd/read.c [iso-8859-1] Tue Aug 12 23:40:39 2008 @@ -573,18 +573,18 @@ AFD_DbgPrint(MID_TRACE,("Recv flags %x\n", RecvReq->AfdFlags)); - if( !IsListEmpty( &FCB->DatagramList ) ) { - RecvReq->BufferArray = LockBuffers( RecvReq->BufferArray, - RecvReq->BufferCount, - RecvReq->Address, - RecvReq->AddressLength, - TRUE, TRUE ); - - if( !RecvReq->BufferArray ) { /* access violation in userspace */ + RecvReq->BufferArray = LockBuffers( RecvReq->BufferArray, + RecvReq->BufferCount, + RecvReq->Address, + RecvReq->AddressLength, + TRUE, TRUE ); + + if( !RecvReq->BufferArray ) { /* access violation in userspace */ return UnlockAndMaybeComplete ( FCB, STATUS_ACCESS_VIOLATION, Irp, 0, NULL ); - } - + } + + if( !IsListEmpty( &FCB->DatagramList ) ) { ListEntry = RemoveHeadList( &FCB->DatagramList ); DatagramRecv = CONTAINING_RECORD ( ListEntry, AFD_STORED_DATAGRAM, ListEntry ); Modified: branches/aicom-network-fixes/drivers/network/afd/afd/write.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/afd/afd/write.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/afd/afd/write.c [iso-8859-1] Tue Aug 12 23:40:39 2008 @@ -280,6 +280,16 @@ AFD_DbgPrint(MID_TRACE,("We already have %d bytes waiting.\n", FCB->Send.BytesUsed)); + SendReq->BufferArray = LockBuffers( SendReq->BufferArray, + SendReq->BufferCount, + NULL, NULL, + FALSE, FALSE ); + + if( !SendReq->BufferArray ) { + return UnlockAndMaybeComplete( FCB, STATUS_ACCESS_VIOLATION, + Irp, 0, NULL ); + } + AFD_DbgPrint(MID_TRACE,("FCB->Send.BytesUsed = %d\n", FCB->Send.BytesUsed)); @@ -288,16 +298,6 @@ AFD_DbgPrint(MID_TRACE,("We can accept %d bytes\n", SpaceAvail)); - - SendReq->BufferArray = LockBuffers( SendReq->BufferArray, - SendReq->BufferCount, - NULL, NULL, - FALSE, FALSE ); - - if( !SendReq->BufferArray ) { - return UnlockAndMaybeComplete( FCB, STATUS_ACCESS_VIOLATION, - Irp, 0, NULL ); - } for( i = 0; FCB->Send.BytesUsed < FCB->Send.Size && i < SendReq->BufferCount; i++ ) {

1 0

[cgutman] 35297: - Don't crash if we are already freed - Some code frees the buffers right after an operation fails which is fine
by cgutman＠svn.reactos.org 13 Aug '08

13 Aug '08

Author: cgutman Date: Tue Aug 12 21:55:05 2008 New Revision: 35297 URL: http://svn.reactos.org/svn/reactos?rev=35297&view=rev Log: - Don't crash if we are already freed - Some code frees the buffers right after an operation fails which is fine Modified: branches/aicom-network-fixes/drivers/network/afd/afd/lock.c Modified: branches/aicom-network-fixes/drivers/network/afd/afd/lock.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/afd/afd/lock.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/afd/afd/lock.c [iso-8859-1] Tue Aug 12 21:55:05 2008 @@ -112,6 +112,8 @@ PAFD_MAPBUF Map = (PAFD_MAPBUF)(Buf + Count + Lock); UINT i; + if( !Buf ) return; + for( i = 0; i < Count + Lock; i++ ) { if( Map[i].Mdl ) { MmUnlockPages( Map[i].Mdl );

1 0

[cgutman] 35296: - Move memory freeing to ListenComplete
by cgutman＠svn.reactos.org 13 Aug '08

13 Aug '08

Author: cgutman Date: Tue Aug 12 19:19:34 2008 New Revision: 35296 URL: http://svn.reactos.org/svn/reactos?rev=35296&view=rev Log: - Move memory freeing to ListenComplete Modified: branches/aicom-network-fixes/drivers/network/afd/afd/listen.c branches/aicom-network-fixes/drivers/network/afd/afd/main.c Modified: branches/aicom-network-fixes/drivers/network/afd/afd/listen.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/afd/afd/listen.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/afd/afd/listen.c [iso-8859-1] Tue Aug 12 19:19:34 2008 @@ -142,6 +142,8 @@ ListEntry ) ); } + if( FCB->ListenIrp.ConnectionCallInfo ) ExFreePool( FCB->ListenIrp.ConnectionCallInfo ); + if( FCB->ListenIrp.ConnectionReturnInfo ) ExFreePool( FCB->ListenIrp.ConnectionReturnInfo ); FCB->NeedsNewListen = TRUE; /* Trigger a select return if appropriate */ Modified: branches/aicom-network-fixes/drivers/network/afd/afd/main.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/afd/afd/main.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/afd/afd/main.c [iso-8859-1] Tue Aug 12 19:19:34 2008 @@ -193,9 +193,6 @@ InFlightRequest[i]->InFlightRequest->IoStatus.Status = STATUS_CANCELLED; InFlightRequest[i]->InFlightRequest->IoStatus.Information = 0; IoCancelIrp( InFlightRequest[i]->InFlightRequest ); - InFlightRequest[i]->InFlightRequest = NULL; - if( InFlightRequest[i]->ConnectionCallInfo ) ExFreePool( InFlightRequest[i]->ConnectionCallInfo ); - if( InFlightRequest[i]->ConnectionReturnInfo ) ExFreePool( InFlightRequest[i]->ConnectionReturnInfo ); } }

1 0

[jmorlan] 35295: - Moved ExpandAlias call from ParseCommandLine to ReadCommand; aliases should only be processed when reading from the console. Removed processing of %variable% substitutions in ExpandAlias - not necessary now that aliases are expanded earlier. - Rewrite %variable% substitution code, should be much more compatible with Windows cmd now.
by jmorlan＠svn.reactos.org 12 Aug '08

12 Aug '08

Author: jmorlan Date: Tue Aug 12 18:46:15 2008 New Revision: 35295 URL: http://svn.reactos.org/svn/reactos?rev=35295&view=rev Log: - Moved ExpandAlias call from ParseCommandLine to ReadCommand; aliases should only be processed when reading from the console. Removed processing of %variable% substitutions in ExpandAlias - not necessary now that aliases are expanded earlier. - Rewrite %variable% substitution code, should be much more compatible with Windows cmd now. Modified: trunk/reactos/base/shell/cmd/alias.c trunk/reactos/base/shell/cmd/cmd.c trunk/reactos/base/shell/cmd/cmdinput.c Modified: trunk/reactos/base/shell/cmd/alias.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/alias.c?rev… ============================================================================== --- trunk/reactos/base/shell/cmd/alias.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/alias.c [iso-8859-1] Tue Aug 12 18:46:15 2008 @@ -89,8 +89,6 @@ TCHAR* position; LPTSTR Token; LPTSTR tmp; - LPTSTR ip, cp; - BOOL bModeSetA = FALSE; tmp = cmd_alloc(maxlen); if (!tmp) @@ -135,27 +133,6 @@ { _tcscpy(cmd, buffer); } - - ip = cp = cmd; - - while (*ip) - { - if ( (*ip == _T('%')) || (*ip == _T('!')) ) - { - UINT envNameLen; - LPCTSTR envVal = GetParsedEnvVar ( ip, &envNameLen, bModeSetA ); - if ( envVal ) - { - ip += envNameLen; - cp = _stpcpy ( cp, envVal ); - } - } - - if (*ip != _T('\0') && (_istcntrl (*ip))) - *ip = _T(' '); - *cp++ = *ip++; - } - *cp = _T('\0'); cmd_free(buffer); cmd_free(tmp); Modified: trunk/reactos/base/shell/cmd/cmd.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/cmd.c?rev=3… ============================================================================== --- trunk/reactos/base/shell/cmd/cmd.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/cmd.c [iso-8859-1] Tue Aug 12 18:46:15 2008 @@ -712,11 +712,6 @@ TRACE ("ParseCommandLine: (\'%s\')\n", debugstr_aw(s)); -#ifdef FEATURE_ALIASES - /* expand all aliases */ - ExpandAlias (s, CMDLINE_LENGTH); -#endif /* FEATURE_ALIAS */ - #ifdef FEATURE_REDIRECTION /* find the temp path to store temporary files */ Length = GetTempPath (MAX_PATH, szTempPath); @@ -1092,57 +1087,20 @@ static LPTSTR ret = NULL; static UINT retlen = 0; UINT size; - TCHAR varNameFixed[MAX_PATH]; - TCHAR ReturnValue[MAX_PATH]; - LPTSTR position; - LPTSTR Token; - SIZE_T i = 0; - INT StringPart[1] = {0}; - - position = _tcsstr(varName, _T(":~")); - if (position) - _tcsncpy(varNameFixed, varName, (int) (position - varName)); - else - _tcscpy(varNameFixed, varName); - - size = GetEnvironmentVariable ( varNameFixed, ret, retlen ); + + size = GetEnvironmentVariable ( varName, ret, retlen ); if ( size > retlen ) { if ( !GrowIfNecessary ( size, &ret, &retlen ) ) return NULL; - size = GetEnvironmentVariable ( varNameFixed, ret, retlen ); + size = GetEnvironmentVariable ( varName, ret, retlen ); } if ( size ) - { - if (position) - { - position += 2; - if (_tcschr(position, _T(',')) != NULL) - { - Token = _tcstok(position, _T(",")); - while ((Token != NULL) && (i < 2)) - { - StringPart[i] = _ttoi(Token); - i++; - Token = _tcstok (NULL, _T(",")); - } - if (i > 0) - { - if (StringPart[1] < 0) - StringPart[1] = _tcslen(ret + StringPart[0]) + StringPart[1]; - _tcsncpy(ReturnValue, ret + StringPart[0], StringPart[1]); - _tcscpy(ret, ReturnValue); - } - } - return ret; - } - else - return ret; - } + return ret; /* env var doesn't exist, look for a "special" one */ /* %CD% */ - if (_tcsicmp(varNameFixed,_T("cd")) ==0) + if (_tcsicmp(varName,_T("cd")) ==0) { size = GetCurrentDirectory ( retlen, ret ); if ( size > retlen ) @@ -1156,7 +1114,7 @@ return ret; } /* %TIME% */ - else if (_tcsicmp(varNameFixed,_T("time")) ==0) + else if (_tcsicmp(varName,_T("time")) ==0) { SYSTEMTIME t; if ( !GrowIfNecessary ( MAX_PATH, &ret, &retlen ) ) @@ -1168,7 +1126,7 @@ return ret; } /* %DATE% */ - else if (_tcsicmp(varNameFixed,_T("date")) ==0) + else if (_tcsicmp(varName,_T("date")) ==0) { if ( !GrowIfNecessary ( GetDateFormat(LOCALE_USER_DEFAULT, DATE_SHORTDATE, NULL, NULL, NULL, 0), &ret, &retlen ) ) @@ -1182,7 +1140,7 @@ } /* %RANDOM% */ - else if (_tcsicmp(varNameFixed,_T("random")) ==0) + else if (_tcsicmp(varName,_T("random")) ==0) { if ( !GrowIfNecessary ( MAX_PATH, &ret, &retlen ) ) return NULL; @@ -1192,13 +1150,13 @@ } /* %CMDCMDLINE% */ - else if (_tcsicmp(varNameFixed,_T("cmdcmdline")) ==0) + else if (_tcsicmp(varName,_T("cmdcmdline")) ==0) { return GetCommandLine(); } /* %CMDEXTVERSION% */ - else if (_tcsicmp(varNameFixed,_T("cmdextversion")) ==0) + else if (_tcsicmp(varName,_T("cmdextversion")) ==0) { if ( !GrowIfNecessary ( MAX_PATH, &ret, &retlen ) ) return NULL; @@ -1208,7 +1166,7 @@ } /* %ERRORLEVEL% */ - else if (_tcsicmp(varNameFixed,_T("errorlevel")) ==0) + else if (_tcsicmp(varName,_T("errorlevel")) ==0) { if ( !GrowIfNecessary ( MAX_PATH, &ret, &retlen ) ) return NULL; @@ -1216,30 +1174,17 @@ return ret; } - GrowIfNecessary(_tcslen(varNameFixed) + 3, &ret, &retlen); - _stprintf(ret,_T("%%%s%%"),varNameFixed); - return ret; /* not found - return orginal string */ + return NULL; } LPCTSTR -GetParsedEnvVar ( LPCTSTR varName, UINT* varNameLen, BOOL ModeSetA ) +GetBatchVar ( LPCTSTR varName, UINT* varNameLen ) { static LPTSTR ret = NULL; static UINT retlen = 0; - LPTSTR p, tmp; - UINT size; - TCHAR c; if ( varNameLen ) - *varNameLen = 0; - SetLastError(0); - c = *varName; - - if ( (*varName != '!') && (*varName++ != '%') ) - return NULL; - - if (c == _T('!')) - varName++; + *varNameLen = 1; switch ( *varName ) { @@ -1248,7 +1193,7 @@ if (_tcsncicmp(varName, _T("dp0"), 3) == 0) { if ( varNameLen ) - *varNameLen = 5; + *varNameLen = 4; return bc->BatchFilePath; } case _T('0'): @@ -1261,60 +1206,16 @@ 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; + return FindArg(*varName - _T('0')); case _T('*'): - if(bc == NULL) - { - // - // No batch file to see here, move along - // - if ( !GrowIfNecessary ( 3, &ret, &retlen ) ) - return NULL; - ret[0] = _T('%'); - ret[1] = _T('*'); - ret[2] = 0; - if ( varNameLen ) - *varNameLen = 2; - return ret; - } - // // Copy over the raw params(not including the batch file name // - if ( !GrowIfNecessary ( _tcslen(bc->raw_params)+1, &ret, &retlen ) ) - return NULL; - if ( varNameLen ) - *varNameLen = 2; - _tcscpy ( ret, bc->raw_params ); - return ret; + return bc->raw_params; case _T('%'): - if ( !GrowIfNecessary ( 2, &ret, &retlen ) ) - return NULL; - ret[0] = _T('%'); - ret[1] = 0; - if ( varNameLen ) - *varNameLen = 2; - return ret; + return _T("%"); case _T('?'): /* TODO FIXME 10 is only max size for 32-bit */ @@ -1323,34 +1224,163 @@ _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, c ); - 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 ); + return NULL; +} + +BOOL +SubstituteVars(TCHAR *Src, TCHAR *Dest, TCHAR Delim, BOOL bIsBatch) +{ +#define APPEND(From, Length) { \ + if (Dest + (Length) > DestEnd) \ + goto too_long; \ + memcpy(Dest, From, (Length) * sizeof(TCHAR)); \ + Dest += Length; } +#define APPEND1(Char) { \ + if (Dest >= DestEnd) \ + goto too_long; \ + *Dest++ = Char; } + + TCHAR *DestEnd = Dest + CMDLINE_LENGTH - 1; + const TCHAR *Var; + int VarLength; + TCHAR *SubstStart; + TCHAR EndChr; + while (*Src) + { + if (*Src != Delim) + { + APPEND1(*Src++) + continue; + } + + Src++; + if (bIsBatch && Delim == _T('%')) + { + UINT NameLen; + Var = GetBatchVar(Src, &NameLen); + if (Var != NULL) + { + VarLength = _tcslen(Var); + APPEND(Var, VarLength) + Src += NameLen; + continue; + } + } + + /* Find the end of the variable name. A colon (:) will usually + * end the name and begin the optional modifier, but not if it + * is immediately followed by the delimiter (%VAR:%). */ + SubstStart = Src; + while (*Src != Delim && !(*Src == _T(':') && Src[1] != Delim)) + { + if (!*Src) + goto bad_subst; + Src++; + } + + EndChr = *Src; + *Src = _T('\0'); + Var = GetEnvVarOrSpecial(SubstStart); + *Src++ = EndChr; + if (Var == NULL) + { + /* In a batch file, %NONEXISTENT% "expands" to an empty string */ + if (bIsBatch) + continue; + goto bad_subst; + } + VarLength = _tcslen(Var); + + if (EndChr == Delim) + { + /* %VAR% - use as-is */ + APPEND(Var, VarLength) + } + else if (*Src == _T('~')) + { + /* %VAR:~[start][,length]% - substring + * Negative values are offsets from the end */ + int Start = _tcstol(Src + 1, &Src, 0); + int End = VarLength; + if (Start < 0) + Start += VarLength; + Start = max(Start, 0); + Start = min(Start, VarLength); + if (*Src == _T(',')) + { + End = _tcstol(Src + 1, &Src, 0); + End += (End < 0) ? VarLength : Start; + End = max(End, Start); + End = min(End, VarLength); + } + if (*Src++ != Delim) + goto bad_subst; + APPEND(&Var[Start], End - Start); + } + else + { + /* %VAR:old=new% - replace all occurrences of old with new + * %VAR:*old=new% - replace first occurrence only, + * and remove everything before it */ + TCHAR *Old, *New; + DWORD OldLength, NewLength; + BOOL Star = FALSE; + int LastMatch = 0, i = 0; + + if (*Src == _T('*')) + { + Star = TRUE; + Src++; + } + + /* the string to replace may contain the delimiter */ + Src = _tcschr(Old = Src, _T('=')); + if (Src == NULL) + goto bad_subst; + OldLength = Src++ - Old; + if (OldLength == 0) + goto bad_subst; + + Src = _tcschr(New = Src, Delim); + if (Src == NULL) + goto bad_subst; + NewLength = Src++ - New; + + while (i < VarLength) + { + if (_tcsnicmp(&Var[i], Old, OldLength) == 0) + { + if (!Star) + APPEND(&Var[LastMatch], i - LastMatch) + APPEND(New, NewLength) + i += OldLength; + LastMatch = i; + if (Star) + break; + continue; + } + i++; + } + APPEND(&Var[LastMatch], VarLength - LastMatch) + } + continue; + + bad_subst: + Src = SubstStart; + if (!bIsBatch) + APPEND1(Delim) + } + *Dest = _T('\0'); + return TRUE; +too_long: + ConOutResPrintf(STRING_ALIAS_ERROR); + nErrorLevel = 9023; + return FALSE; +#undef APPEND +#undef APPEND1 } @@ -1365,10 +1395,7 @@ TCHAR commandline[CMDLINE_LENGTH]; TCHAR readline[CMDLINE_LENGTH]; LPTSTR ip; - LPTSTR cp; - LPCTSTR tmp; BOOL bEchoThisLine; - BOOL bModeSetA; BOOL bIsBatch; do @@ -1393,94 +1420,8 @@ while ( _istspace(*ip) ) ++ip; - cp = commandline; - bModeSetA = FALSE; - while (*ip) - { - if ( (*ip == _T('%')) || (*ip == _T('!')) ) - { - UINT envNameLen; - LPCTSTR envVal = GetParsedEnvVar ( ip, &envNameLen, bModeSetA ); - if ( envVal ) - { - ip += envNameLen; - cp = _stpcpy ( cp, envVal ); - } - } - - if (*ip != _T('\0') && (_istcntrl (*ip))) - *ip = _T(' '); - *cp++ = *ip++; - - /* HACK HACK HACK check whether bModeSetA needs to be toggled */ - *cp = 0; - tmp = commandline; - tmp += _tcsspn(tmp,_T(" \t")); - /* first we find and skip and pre-redirections... */ - while (( tmp ) && - ( _tcschr(_T("<>"),*tmp) - || !_tcsncmp(tmp,_T("1>"),2) - || !_tcsncmp(tmp,_T("2>"),2) )) - { - if ( _istdigit(*tmp) ) - tmp += 2; - else - tmp++; - tmp += _tcsspn(tmp,_T(" \t")); - if ( *tmp == _T('\"') ) - { - tmp = _tcschr(tmp+1,_T('\"')); - if ( tmp ) - ++tmp; - } - else - tmp = _tcspbrk(tmp,_T(" \t")); - if ( tmp ) - tmp += _tcsspn(tmp,_T(" \t")); - } - /* we should now be pointing to the actual command - * (if there is one yet)*/ - if ( tmp ) - { - /* if we're currently substituting ( which is default ) - * 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 ( !bModeSetA ) - { - /* look for set /a */ - if ( !_tcsnicmp(tmp,_T("set"),3) ) - { - tmp += 3; - tmp += _tcsspn(tmp,_T(" \t")); - if ( !_tcsnicmp(tmp,_T("/a"),2) ) - bModeSetA = TRUE; - } - } - /* if we're not currently substituting, it means we're - * already inside a set /a. now we need to look for - * a redirection in order to turn redirection back on */ - else - { - /* look for redirector of some kind after the command */ - while ( (tmp = _tcspbrk ( tmp, _T("^<>|") )) ) - { - if ( *tmp == _T('^') ) - { - if ( _tcschr(_T("<>|&"), *++tmp ) && *tmp ) - ++tmp; - } - else - { - bModeSetA = FALSE; - break; - } - } - } - } - } - - *cp = _T('\0'); + if (!SubstituteVars(ip, commandline, _T('%'), bIsBatch)) + continue; /* JPP 19980807 */ /* Echo batch file line */ @@ -1489,6 +1430,11 @@ PrintPrompt (); ConOutPuts (commandline); } + + /* FIXME: !vars! should be substituted later, after parsing. */ + if (!SubstituteVars(commandline, readline, _T('!'), bIsBatch)) + continue; + _tcscpy(commandline, readline); if (!CheckCtrlBreak(BREAK_INPUT) && *commandline) { Modified: trunk/reactos/base/shell/cmd/cmdinput.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/cmdinput.c?… ============================================================================== --- trunk/reactos/base/shell/cmd/cmdinput.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/cmdinput.c [iso-8859-1] Tue Aug 12 18:46:15 2008 @@ -587,4 +587,9 @@ while (!bReturn); SetCursorType (bInsert, TRUE); + +#ifdef FEATURE_ALIASES + /* expand all aliases */ + ExpandAlias (str, maxlen); +#endif /* FEATURE_ALIAS */ }

1 0

[sginsberg] 35294: - Temporarily revert my last change. We don't set the SystemThread flag appropriately and it is always zero
by sginsberg＠svn.reactos.org 12 Aug '08

12 Aug '08

Author: sginsberg Date: Tue Aug 12 17:22:51 2008 New Revision: 35294 URL: http://svn.reactos.org/svn/reactos?rev=35294&view=rev Log: - Temporarily revert my last change. We don't set the SystemThread flag appropriately and it is always zero Modified: trunk/reactos/ntoskrnl/ps/kill.c Modified: trunk/reactos/ntoskrnl/ps/kill.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/kill.c?rev=352… ============================================================================== --- trunk/reactos/ntoskrnl/ps/kill.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ps/kill.c [iso-8859-1] Tue Aug 12 17:22:51 2008 @@ -1086,7 +1086,7 @@ PETHREAD Thread = PsGetCurrentThread(); /* Make sure this is a system thread */ - if (!Thread->SystemThread) return STATUS_INVALID_PARAMETER; + if (Thread->SystemThread) return STATUS_INVALID_PARAMETER; /* Terminate it for real */ return PspTerminateThreadByPointer(Thread, ExitStatus, TRUE);

1 0

[sginsberg] 35293: - Fix a typo in PsTerminateSystemThread. Now this API will actually terminate system threads.
by sginsberg＠svn.reactos.org 12 Aug '08

12 Aug '08

Author: sginsberg Date: Tue Aug 12 16:40:06 2008 New Revision: 35293 URL: http://svn.reactos.org/svn/reactos?rev=35293&view=rev Log: - Fix a typo in PsTerminateSystemThread. Now this API will actually terminate system threads. Modified: trunk/reactos/ntoskrnl/ps/kill.c Modified: trunk/reactos/ntoskrnl/ps/kill.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/ps/kill.c?rev=352… ============================================================================== --- trunk/reactos/ntoskrnl/ps/kill.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/ps/kill.c [iso-8859-1] Tue Aug 12 16:40:06 2008 @@ -1086,7 +1086,7 @@ PETHREAD Thread = PsGetCurrentThread(); /* Make sure this is a system thread */ - if (Thread->SystemThread) return STATUS_INVALID_PARAMETER; + if (!Thread->SystemThread) return STATUS_INVALID_PARAMETER; /* Terminate it for real */ return PspTerminateThreadByPointer(Thread, ExitStatus, TRUE);

1 0

[cgutman] 35292: - Check for FCB->TdiDeviceName.Buffer before attempting to access it - Fix 2 more memory leaks
by cgutman＠svn.reactos.org 12 Aug '08

12 Aug '08

Author: cgutman Date: Tue Aug 12 15:03:53 2008 New Revision: 35292 URL: http://svn.reactos.org/svn/reactos?rev=35292&view=rev Log: - Check for FCB->TdiDeviceName.Buffer before attempting to access it - Fix 2 more memory leaks Modified: branches/aicom-network-fixes/drivers/network/afd/afd/main.c Modified: branches/aicom-network-fixes/drivers/network/afd/afd/main.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/afd/afd/main.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/afd/afd/main.c [iso-8859-1] Tue Aug 12 15:03:53 2008 @@ -114,9 +114,6 @@ FCB->TdiDeviceName.MaximumLength = FCB->TdiDeviceName.Length; FCB->TdiDeviceName.Buffer = ExAllocatePool( NonPagedPool, FCB->TdiDeviceName.Length ); - RtlCopyMemory( FCB->TdiDeviceName.Buffer, - ConnectInfo->TransportName, - FCB->TdiDeviceName.Length ); if( !FCB->TdiDeviceName.Buffer ) { ExFreePool(FCB); @@ -125,6 +122,10 @@ IoCompleteRequest( Irp, IO_NETWORK_INCREMENT ); return STATUS_NO_MEMORY; } + + RtlCopyMemory( FCB->TdiDeviceName.Buffer, + ConnectInfo->TransportName, + FCB->TdiDeviceName.Length ); AFD_DbgPrint(MID_TRACE,("Success: %s %wZ\n", EaInfo->EaName, &FCB->TdiDeviceName)); @@ -192,6 +193,9 @@ InFlightRequest[i]->InFlightRequest->IoStatus.Status = STATUS_CANCELLED; InFlightRequest[i]->InFlightRequest->IoStatus.Information = 0; IoCancelIrp( InFlightRequest[i]->InFlightRequest ); + InFlightRequest[i]->InFlightRequest = NULL; + if( InFlightRequest[i]->ConnectionCallInfo ) ExFreePool( InFlightRequest[i]->ConnectionCallInfo ); + if( InFlightRequest[i]->ConnectionReturnInfo ) ExFreePool( InFlightRequest[i]->ConnectionReturnInfo ); } }

1 0

[cgutman] 35291: - Free the MDL on failure - Use _SEH_YIELD
by cgutman＠svn.reactos.org 12 Aug '08

12 Aug '08

Author: cgutman Date: Tue Aug 12 13:34:07 2008 New Revision: 35291 URL: http://svn.reactos.org/svn/reactos?rev=35291&view=rev Log: - Free the MDL on failure - Use _SEH_YIELD Modified: branches/aicom-network-fixes/drivers/network/afd/afd/tdi.c Modified: branches/aicom-network-fixes/drivers/network/afd/afd/tdi.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/afd/afd/tdi.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/afd/afd/tdi.c [iso-8859-1] Tue Aug 12 13:34:07 2008 @@ -864,16 +864,11 @@ MmProbeAndLockPages(Mdl, KernelMode, IoModifyAccess); } _SEH_HANDLE { AFD_DbgPrint(MIN_TRACE, ("MmProbeAndLockPages() failed.\n")); + IoFreeMdl(Mdl); IoFreeIrp(*Irp); *Irp = NULL; - Status = STATUS_INSUFFICIENT_RESOURCES; + _SEH_YIELD(return STATUS_INSUFFICIENT_RESOURCES); } _SEH_END; - - if( !NT_SUCCESS(Status) ) { - IoFreeIrp(*Irp); - *Irp = NULL; - return Status; - } AFD_DbgPrint(MID_TRACE,("AFD>>> Got an MDL: %x\n", Mdl)); @@ -952,16 +947,11 @@ AFD_DbgPrint(MIN_TRACE, ("probe and lock done\n")); } _SEH_HANDLE { AFD_DbgPrint(MIN_TRACE, ("MmProbeAndLockPages() failed.\n")); + IoFreeMdl(Mdl); IoFreeIrp(*Irp); *Irp = NULL; - Status = STATUS_INSUFFICIENT_RESOURCES; + _SEH_YIELD(return STATUS_INSUFFICIENT_RESOURCES); } _SEH_END; - - if( !NT_SUCCESS(Status) ) { - IoFreeIrp(*Irp); - *Irp = NULL; - return Status; - } AFD_DbgPrint(MID_TRACE,("AFD>>> Got an MDL: %x\n", Mdl)); @@ -1055,6 +1045,7 @@ MmProbeAndLockPages(Mdl, KernelMode, IoModifyAccess); } _SEH_HANDLE { AFD_DbgPrint(MIN_TRACE, ("MmProbeAndLockPages() failed.\n")); + IoFreeMdl(Mdl); IoFreeIrp(*Irp); *Irp = NULL; _SEH_YIELD(return STATUS_INSUFFICIENT_RESOURCES); @@ -1153,6 +1144,7 @@ MmProbeAndLockPages(Mdl, KernelMode, IoModifyAccess); } _SEH_HANDLE { AFD_DbgPrint(MIN_TRACE, ("MmProbeAndLockPages() failed.\n")); + IoFreeMdl(Mdl); IoFreeIrp(*Irp); *Irp = NULL; _SEH_YIELD(return STATUS_INSUFFICIENT_RESOURCES);

1 0

[cgutman] 35290: - Make sure both FCB->Recv.Window and FCB->Send.Window were created before returning STATUS_SUCCESS - Make sure MakeSocketIntoConnection() completed successfully - Make sure WarmSocketForConnection() completed successfully - Don't continue if TdiBuildNullConnectionInfoInPlace() fails - SEHify TdiBuildConnectionInfoInPlace() - Make sure we have a non-NULL TargetAddress before calling TdiSendDatagram()
by cgutman＠svn.reactos.org 12 Aug '08

12 Aug '08

Author: cgutman Date: Tue Aug 12 13:18:03 2008 New Revision: 35290 URL: http://svn.reactos.org/svn/reactos?rev=35290&view=rev Log: - Make sure both FCB->Recv.Window and FCB->Send.Window were created before returning STATUS_SUCCESS - Make sure MakeSocketIntoConnection() completed successfully - Make sure WarmSocketForConnection() completed successfully - Don't continue if TdiBuildNullConnectionInfoInPlace() fails - SEHify TdiBuildConnectionInfoInPlace() - Make sure we have a non-NULL TargetAddress before calling TdiSendDatagram() Modified: branches/aicom-network-fixes/drivers/network/afd/afd/connect.c branches/aicom-network-fixes/drivers/network/afd/afd/listen.c branches/aicom-network-fixes/drivers/network/afd/afd/tdiconn.c branches/aicom-network-fixes/drivers/network/afd/afd/write.c Modified: branches/aicom-network-fixes/drivers/network/afd/afd/connect.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/afd/afd/connect.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/afd/afd/connect.c [iso-8859-1] Tue Aug 12 13:18:03 2008 @@ -33,26 +33,32 @@ } NTSTATUS MakeSocketIntoConnection( PAFD_FCB FCB ) { - NTSTATUS Status = STATUS_NO_MEMORY; + NTSTATUS Status; /* Allocate the receive area and start receiving */ FCB->Recv.Window = ExAllocatePool( NonPagedPool, FCB->Recv.Size ); + + if( !FCB->Recv.Window ) return STATUS_NO_MEMORY; + FCB->Send.Window = ExAllocatePool( NonPagedPool, FCB->Send.Size ); + if( !FCB->Send.Window ) { + ExFreePool( FCB->Recv.Window ); + return STATUS_NO_MEMORY; + } + FCB->State = SOCKET_STATE_CONNECTED; - if( FCB->Recv.Window ) { - Status = TdiReceive( &FCB->ReceiveIrp.InFlightRequest, - FCB->Connection.Object, - TDI_RECEIVE_NORMAL, - FCB->Recv.Window, - FCB->Recv.Size, - &FCB->ReceiveIrp.Iosb, - ReceiveComplete, - FCB ); - } + Status = TdiReceive( &FCB->ReceiveIrp.InFlightRequest, + FCB->Connection.Object, + TDI_RECEIVE_NORMAL, + FCB->Recv.Window, + FCB->Recv.Size, + &FCB->ReceiveIrp.Iosb, + ReceiveComplete, + FCB ); return Status; } @@ -102,8 +108,9 @@ if( NT_SUCCESS(Status) ) { Status = MakeSocketIntoConnection( FCB ); - if( FCB->Send.Window && - !IsListEmpty( &FCB->PendingIrpList[FUNCTION_SEND] ) ) { + if( !NT_SUCCESS(Status) ) return Status; + + if( !IsListEmpty( &FCB->PendingIrpList[FUNCTION_SEND] ) ) { NextIrpEntry = RemoveHeadList(&FCB->PendingIrpList[FUNCTION_SEND]); NextIrp = CONTAINING_RECORD(NextIrpEntry, IRP, Tail.Overlay.ListEntry); @@ -158,7 +165,7 @@ case SOCKET_STATE_CONNECTING: return LeaveIrpUntilLater( FCB, Irp, FUNCTION_CONNECT ); - case SOCKET_STATE_CREATED: { + case SOCKET_STATE_CREATED: FCB->LocalAddress = TaCopyTransportAddress( &ConnectReq->RemoteAddress ); @@ -182,7 +189,8 @@ } else return UnlockAndMaybeComplete ( FCB, STATUS_NO_MEMORY, Irp, 0, NULL ); - } /* Drop through to SOCKET_STATE_BOUND */ + + /* Drop through to SOCKET_STATE_BOUND */ case SOCKET_STATE_BOUND: FCB->RemoteAddress = Modified: branches/aicom-network-fixes/drivers/network/afd/afd/listen.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/afd/afd/listen.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/afd/afd/listen.c [iso-8859-1] Tue Aug 12 13:18:03 2008 @@ -182,9 +182,11 @@ Status = WarmSocketForConnection( FCB ); + AFD_DbgPrint(MID_TRACE,("Status from warmsocket %x\n", Status)); + + if( !NT_SUCCESS(Status) ) return UnlockAndMaybeComplete( FCB, Status, Irp, 0, NULL ); + FCB->State = SOCKET_STATE_LISTENING; - - AFD_DbgPrint(MID_TRACE,("Status from warmsocket %x\n", Status)); TdiBuildNullConnectionInfo ( &FCB->ListenIrp.ConnectionCallInfo, @@ -274,7 +276,7 @@ &FCB->ListenIrp.Iosb, ListenComplete, FCB ); - } + } else return UnlockAndMaybeComplete( FCB, Status, Irp, 0, NULL ); FCB->NeedsNewListen = FALSE; } Modified: branches/aicom-network-fixes/drivers/network/afd/afd/tdiconn.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/afd/afd/tdiconn.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/afd/afd/tdiconn.c [iso-8859-1] Tue Aug 12 13:18:03 2008 @@ -8,6 +8,7 @@ * 20040708 Created */ #include <afd.h> +#include <pseh/pseh.h> #include "debug.h" #include "tdiconn.h" @@ -126,9 +127,11 @@ Status = TdiBuildNullConnectionInfoInPlace( ConnInfo, Type ); - if (!NT_SUCCESS(Status)) + if (!NT_SUCCESS(Status)) { ExFreePool( ConnInfo ); - else + *ConnectionInfo = NULL; + return Status; + } else *ConnectionInfo = ConnInfo; ConnInfo->RemoteAddress = (PTA_ADDRESS)&ConnInfo[1]; @@ -144,9 +147,13 @@ PTRANSPORT_ADDRESS Address ) { NTSTATUS Status = STATUS_SUCCESS; - RtlCopyMemory( ConnectionInfo->RemoteAddress, - Address, - ConnectionInfo->RemoteAddressLength ); + _SEH_TRY { + RtlCopyMemory( ConnectionInfo->RemoteAddress, + Address, + ConnectionInfo->RemoteAddressLength ); + } _SEH_HANDLE { + Status = _SEH_GetExceptionCode(); + } _SEH_END; return Status; } Modified: branches/aicom-network-fixes/drivers/network/afd/afd/write.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/afd/afd/write.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/afd/afd/write.c [iso-8859-1] Tue Aug 12 13:18:03 2008 @@ -233,21 +233,23 @@ TdiBuildConnectionInfo( &TargetAddress, FCB->RemoteAddress ); - SocketCalloutEnter( FCB ); - - Status = TdiSendDatagram - ( &FCB->SendIrp.InFlightRequest, - FCB->AddressFile.Object, - SendReq->BufferArray[0].buf, - SendReq->BufferArray[0].len, - TargetAddress, - &FCB->SendIrp.Iosb, - PacketSocketSendComplete, - FCB ); - - SocketCalloutLeave( FCB ); - - ExFreePool( TargetAddress ); + if( TargetAddress ) { + SocketCalloutEnter( FCB ); + + Status = TdiSendDatagram + ( &FCB->SendIrp.InFlightRequest, + FCB->AddressFile.Object, + SendReq->BufferArray[0].buf, + SendReq->BufferArray[0].len, + TargetAddress, + &FCB->SendIrp.Iosb, + PacketSocketSendComplete, + FCB ); + + SocketCalloutLeave( FCB ); + + ExFreePool( TargetAddress ); + } else Status = STATUS_NO_MEMORY; if( Status == STATUS_PENDING ) Status = STATUS_SUCCESS;

1 0

[cgutman] 35289: - Fix another memory leak
by cgutman＠svn.reactos.org 12 Aug '08

12 Aug '08

Author: cgutman Date: Tue Aug 12 10:27:15 2008 New Revision: 35289 URL: http://svn.reactos.org/svn/reactos?rev=35289&view=rev Log: - Fix another memory leak Modified: branches/aicom-network-fixes/drivers/network/afd/afd/main.c Modified: branches/aicom-network-fixes/drivers/network/afd/afd/main.c URL: http://svn.reactos.org/svn/reactos/branches/aicom-network-fixes/drivers/net… ============================================================================== --- branches/aicom-network-fixes/drivers/network/afd/afd/main.c [iso-8859-1] (original) +++ branches/aicom-network-fixes/drivers/network/afd/afd/main.c [iso-8859-1] Tue Aug 12 10:27:15 2008 @@ -207,6 +207,8 @@ ExFreePool( FCB->AddressFrom ); if( FCB->LocalAddress ) ExFreePool( FCB->LocalAddress ); + if( FCB->RemoteAddress ) + ExFreePool( FCB->RemoteAddress ); ExFreePool(FCB->TdiDeviceName.Buffer);

1 0

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