Ros-diffs February 2009

ros-diffs@reactos.org

29 participants
559 discussions

[fireball] 39621: - Fix small formatting leftover from r39422.
by fireball＠svn.reactos.org 16 Feb '09

16 Feb '09

Author: fireball Date: Mon Feb 16 05:18:37 2009 New Revision: 39621 URL: http://svn.reactos.org/svn/reactos?rev=39621&view=rev Log: - Fix small formatting leftover from r39422. Modified: trunk/reactos/ntoskrnl/config/cmkcbncb.c Modified: trunk/reactos/ntoskrnl/config/cmkcbncb.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/config/cmkcbncb.c… ============================================================================== --- trunk/reactos/ntoskrnl/config/cmkcbncb.c [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/config/cmkcbncb.c [iso-8859-1] Mon Feb 16 05:18:37 2009 @@ -196,7 +196,7 @@ Ncb = CONTAINING_RECORD(HashEntry, CM_NAME_CONTROL_BLOCK, NameHash); /* Check if the hash matches */ - if (ConvKey == HashEntry->ConvKey && Length == Ncb->NameLength) + if ((ConvKey == HashEntry->ConvKey) && (Length == Ncb->NameLength)) { /* Assume success */ Found = TRUE;

1 0

[dchapyshev] 39620: - Fix copypaste typo in IopUpdateOperationCount
by dchapyshev＠svn.reactos.org 16 Feb '09

16 Feb '09

Author: dchapyshev Date: Mon Feb 16 05:02:23 2009 New Revision: 39620 URL: http://svn.reactos.org/svn/reactos?rev=39620&view=rev Log: - Fix copypaste typo in IopUpdateOperationCount Modified: trunk/reactos/ntoskrnl/include/internal/io_x.h Modified: trunk/reactos/ntoskrnl/include/internal/io_x.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/ntoskrnl/include/internal/… ============================================================================== --- trunk/reactos/ntoskrnl/include/internal/io_x.h [iso-8859-1] (original) +++ trunk/reactos/ntoskrnl/include/internal/io_x.h [iso-8859-1] Mon Feb 16 05:02:23 2009 @@ -75,13 +75,13 @@ { /* Increase write count */ IoWriteOperationCount++; - CountToChange = &PsGetCurrentProcess()->ReadOperationCount; + CountToChange = &PsGetCurrentProcess()->WriteOperationCount; } else { /* Increase other count */ IoOtherOperationCount++; - CountToChange = &PsGetCurrentProcess()->ReadOperationCount; + CountToChange = &PsGetCurrentProcess()->OtherOperationCount; } /* Increase the process-wide count */

1 0

[mkupfer] 39619: define IDC_STATIC as -1 instead of 100 (prevent confusing warnings)
by mkupfer＠svn.reactos.org 16 Feb '09

16 Feb '09

Author: mkupfer Date: Mon Feb 16 04:10:44 2009 New Revision: 39619 URL: http://svn.reactos.org/svn/reactos?rev=39619&view=rev Log: define IDC_STATIC as -1 instead of 100 (prevent confusing warnings) Modified: trunk/reactos/subsystems/win32/csrss/win32csr/resource.h Modified: trunk/reactos/subsystems/win32/csrss/win32csr/resource.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/csrss/win… ============================================================================== --- trunk/reactos/subsystems/win32/csrss/win32csr/resource.h [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/csrss/win32csr/resource.h [iso-8859-1] Mon Feb 16 04:10:44 2009 @@ -13,7 +13,7 @@ #define IDD_NOT_RESPONDING 11 #define IDD_SWITCH_APP 12 -#define IDC_STATIC 100 +#define IDC_STATIC -1 #define IDC_PROGRESS 101 #define IDC_END_NOW 102 #define IDC_STATIC_CUR_APP 103

1 0

[jmorlan] 39618: SET /A improvements: - Strip quotes from expression - Use _tcstol instead of _ttoi to parse numbers, allowing hex/octal numbers to be used - Skip space after an identifier - Don't echo result when in a batch file
by jmorlan＠svn.reactos.org 16 Feb '09

16 Feb '09

Author: jmorlan Date: Sun Feb 15 21:00:27 2009 New Revision: 39618 URL: http://svn.reactos.org/svn/reactos?rev=39618&view=rev Log: SET /A improvements: - Strip quotes from expression - Use _tcstol instead of _ttoi to parse numbers, allowing hex/octal numbers to be used - Skip space after an identifier - Don't echo result when in a batch file Modified: trunk/reactos/base/shell/cmd/set.c Modified: trunk/reactos/base/shell/cmd/set.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/set.c?rev=3… ============================================================================== --- trunk/reactos/base/shell/cmd/set.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/set.c [iso-8859-1] Sun Feb 15 21:00:27 2009 @@ -106,7 +106,9 @@ /* the /A does *NOT* have to be followed by a whitespace */ if ( !_tcsnicmp (param, _T("/A"), 2) ) { - BOOL Success = seta_eval ( skip_ws(param+2) ); + BOOL Success; + StripQuotes(param); + Success = seta_eval ( skip_ws(param+2) ); if(!Success) { /*might seem random but this is what windows xp does */ @@ -230,7 +232,7 @@ *result = 0; return FALSE; } - *result = _ttoi ( identVal ); + *result = _tcstol ( identVal, NULL, 0 ); return TRUE; } @@ -283,18 +285,16 @@ p = skip_ws ( p + 1 ); if ( !seta_stmt ( &p, &rval ) ) return FALSE; - if ( *p != _T(')') ) + if ( *p++ != _T(')') ) { ConErrResPuts ( STRING_EXPECTED_CLOSE_PAREN ); return FALSE; } *result = rval; - p = skip_ws ( p + 1 ); } else if ( isdigit(*p) ) { - *result = _ttoi ( p ); - p = skip_ws ( p + _tcsspn ( p, _T("1234567890") ) ); + *result = _tcstol ( p, (LPTSTR *)&p, 0 ); } else if ( __iscsymf(*p) ) { @@ -309,7 +309,7 @@ ConErrResPuts ( STRING_EXPECTED_NUMBER_OR_VARIABLE ); return FALSE; } - *p_ = p; + *p_ = skip_ws ( p ); return TRUE; } @@ -447,6 +447,7 @@ PARSE_IDENT(ident,identlen,p); if ( identlen ) { + p = skip_ws(p); if ( *p == _T('=') ) op = *p, p = skip_ws(p+1); else if ( _tcschr ( _T("*/%+-&^|"), *p ) && p[1] == _T('=') ) @@ -531,7 +532,8 @@ } if ( !seta_stmt ( &p, &rval ) ) return FALSE; - ConOutPrintf ( _T("%i"), rval ); + if ( !bc ) + ConOutPrintf ( _T("%i"), rval ); return TRUE; }

1 0

[khornicek] 39617: - add more pixel formats
by khornicek＠svn.reactos.org 15 Feb '09

15 Feb '09

Author: khornicek Date: Sun Feb 15 16:32:41 2009 New Revision: 39617 URL: http://svn.reactos.org/svn/reactos?rev=39617&view=rev Log: - add more pixel formats Modified: branches/reactx/reactos/dll/win32/gdi32/misc/gdientryhelgl.c Modified: branches/reactx/reactos/dll/win32/gdi32/misc/gdientryhelgl.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/win32/gdi32/… ============================================================================== --- branches/reactx/reactos/dll/win32/gdi32/misc/gdientryhelgl.c [iso-8859-1] (original) +++ branches/reactx/reactos/dll/win32/gdi32/misc/gdientryhelgl.c [iso-8859-1] Sun Feb 15 16:32:41 2009 @@ -197,9 +197,13 @@ WINAPI DdUnlock(LPDDHAL_UNLOCKDATA Unlock) { + /* Fixme for opengl hel emulations */ + HEL_OGL_STUB; +#if 0 /* Call win32k */ return NtGdiDdUnlock((HANDLE)Unlock->lpDDSurface->hDDSurface, (PDD_UNLOCKDATA)Unlock); +#endif } /* @@ -1648,6 +1652,28 @@ switch(WineD3DFormat) { + case WINED3DFMT_P8: + ddpf->dwFlags |= DDPF_PALETTEINDEXED8; + ddpf->dwRGBBitCount = 8; + ddpf->dwRBitMask = 0x00000000; + ddpf->dwGBitMask = 0x00000000; + ddpf->dwBBitMask = 0x00000000; + break; + + case WINED3DFMT_R5G6B5: + ddpf->dwRGBBitCount = 16; + ddpf->dwRBitMask = 0x0000f800; + ddpf->dwGBitMask = 0x000007e0; + ddpf->dwBBitMask = 0x0000001f; + break; + + case WINED3DFMT_R8G8B8: + ddpf->dwRGBBitCount = 24; + ddpf->dwRBitMask = 0x00ff0000; + ddpf->dwGBitMask = 0x0000ff00; + ddpf->dwBBitMask = 0x000000ff; + break; + case WINED3DFMT_X8R8G8B8: ddpf->dwRGBBitCount = 32; ddpf->dwRBitMask = 0x00ff0000; @@ -1852,6 +1878,12 @@ /* Convert all the data */ pHalInfo->dwSize = sizeof(DDHALINFO); + + if(!pD3DDevice) + { + CreateWineD3DDevice(pDirectDrawGlobal); + pD3DDevice = (IWineD3DDevice*) pDirectDrawGlobal->dwUnused3; + } IWineD3DDevice_GetDisplayMode(pD3DDevice, 0, &Mode); GetPixelFormatData(&pHalInfo->vmiData.ddpfDisplay, Mode.Format);

1 0

[arty] 39616: Remove an assert that doesn't belong.
by arty＠svn.reactos.org 15 Feb '09

15 Feb '09

Author: arty Date: Sun Feb 15 16:16:20 2009 New Revision: 39616 URL: http://svn.reactos.org/svn/reactos?rev=39616&view=rev Log: Remove an assert that doesn't belong. Modified: trunk/reactos/lib/drivers/ip/network/address.c Modified: trunk/reactos/lib/drivers/ip/network/address.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/lib/drivers/ip/network/add… ============================================================================== --- trunk/reactos/lib/drivers/ip/network/address.c [iso-8859-1] (original) +++ trunk/reactos/lib/drivers/ip/network/address.c [iso-8859-1] Sun Feb 15 16:16:20 2009 @@ -223,7 +223,6 @@ { if (Address1->Type != Address2->Type) { DbgPrint("AddrIsEqual: Unequal Address Types\n"); - ASSERT(FALSE); return FALSE; }

1 0

[tkreuzer] 39615: - switch license to LGPL - fix a typo
by tkreuzer＠svn.reactos.org 15 Feb '09

15 Feb '09

Author: tkreuzer Date: Sun Feb 15 16:15:15 2009 New Revision: 39615 URL: http://svn.reactos.org/svn/reactos?rev=39615&view=rev Log: - switch license to LGPL - fix a typo Modified: trunk/reactos/subsystems/win32/win32k/eng/i386/floatobj.S Modified: trunk/reactos/subsystems/win32/win32k/eng/i386/floatobj.S URL: http://svn.reactos.org/svn/reactos/trunk/reactos/subsystems/win32/win32k/en… ============================================================================== --- trunk/reactos/subsystems/win32/win32k/eng/i386/floatobj.S [iso-8859-1] (original) +++ trunk/reactos/subsystems/win32/win32k/eng/i386/floatobj.S [iso-8859-1] Sun Feb 15 16:15:15 2009 @@ -1,5 +1,5 @@ /* - * COPYRIGHT: See COPYING in the top level directory + * COPYRIGHT: LGPL, see LGPL.txt in the top level directory * PROJECT: ReactOS Win32 subsystem * PURPOSE: FLOATOBJ floating point emulation functions for x86 * FILE: subsystems/win32/win32k/objects/i386/floatobj.S @@ -33,7 +33,7 @@ * Optimization notes: * * - shld is slow (4 cycles) and not pairable, mov + shl is faster - * - esp is used, beacuse it's available earlier + * - esp is used, because it's available earlier * - bsr is very slow on old cpus (up to 72 cycles on a p1) while being much * faster on modern cpus (2-11 cycles). Workarounds using branch trees or * table lookups are of no use nowadays.

1 0

[tkreuzer] 39614: Add a header
by tkreuzer＠svn.reactos.org 15 Feb '09

15 Feb '09

Author: tkreuzer Date: Sun Feb 15 16:14:32 2009 New Revision: 39614 URL: http://svn.reactos.org/svn/reactos?rev=39614&view=rev Log: Add a header Modified: trunk/reactos/tools/hpp/hpp.c Modified: trunk/reactos/tools/hpp/hpp.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/hpp/hpp.c?rev=39614&… ============================================================================== --- trunk/reactos/tools/hpp/hpp.c [iso-8859-1] (original) +++ trunk/reactos/tools/hpp/hpp.c [iso-8859-1] Sun Feb 15 16:14:32 2009 @@ -1,3 +1,11 @@ +/* + * COPYRIGHT: See COPYING in the top level directory + * PROJECT: Header preprocessor + * PURPOSE: Generates header files from other header files + * PROGRAMMER; Timo Kreuzer + * + */ + #include <stdio.h> #include <stdlib.h> #include <stdarg.h>

1 0

[khornicek] 39612: - simplify GdiEntry2 a bit - use wined3d for obtaining pixel format and display info
by khornicek＠svn.reactos.org 15 Feb '09

15 Feb '09

Author: khornicek Date: Sun Feb 15 15:14:36 2009 New Revision: 39612 URL: http://svn.reactos.org/svn/reactos?rev=39612&view=rev Log: - simplify GdiEntry2 a bit - use wined3d for obtaining pixel format and display info Modified: branches/reactx/reactos/dll/win32/gdi32/misc/gdientryhelgl.c Modified: branches/reactx/reactos/dll/win32/gdi32/misc/gdientryhelgl.c URL: http://svn.reactos.org/svn/reactos/branches/reactx/reactos/dll/win32/gdi32/… ============================================================================== --- branches/reactx/reactos/dll/win32/gdi32/misc/gdientryhelgl.c [iso-8859-1] (original) +++ branches/reactx/reactos/dll/win32/gdi32/misc/gdientryhelgl.c [iso-8859-1] Sun Feb 15 15:14:36 2009 @@ -1639,6 +1639,28 @@ return TRUE; } +VOID +GetPixelFormatData(DDPIXELFORMAT *ddpf, WINED3DFORMAT WineD3DFormat) +{ + ddpf->dwFourCC = 0; + ddpf->dwRGBAlphaBitMask = 0x00000000; + ddpf->dwFlags = DDPF_RGB; + + switch(WineD3DFormat) + { + case WINED3DFMT_X8R8G8B8: + ddpf->dwRGBBitCount = 32; + ddpf->dwRBitMask = 0x00ff0000; + ddpf->dwGBitMask = 0x0000ff00; + ddpf->dwBBitMask = 0x000000ff; + break; + + default: + ddpf->dwFlags = 0; + DPRINT1("Unknown pixel format: %d\n", WineD3DFormat); + } +} + BOOL WINAPI bDDCreateSurface(LPDDRAWI_DDRAWSURFACE_LCL pSurface, @@ -1782,21 +1804,13 @@ LPDWORD pdwFourCC, LPVIDMEM pvmList) { - - HDC hdc; - DEVMODEW DevMode; PVIDEOMEMORY VidMemList = NULL; - //DWORD dwNumHeaps=0, FourCCs=0; BOOL retVal = TRUE; - - HBITMAP hbmp; - const UINT bmiSize = sizeof(BITMAPINFOHEADER) + 0x10; - UCHAR *pbmiData; - BITMAPINFO *pbmi; - DWORD *pMasks; - + WINED3DDISPLAYMODE Mode; IWineD3D* pWineD3d; WINED3DCAPS WineCaps; + IWineD3DDevice *pD3DDevice = (IWineD3DDevice*) pDirectDrawGlobal->dwUnused3; + DWORD wined3dFourCCList[] = { MAKEFOURCC('Y','U','Y','2'), @@ -1812,9 +1826,6 @@ }; - - - /* Note : XP always alloc 24*sizeof(VIDEOMEMORY) of pvmlist so we change it to it */ if ( (pvmList != NULL) && (pHalInfo->vmiData.dwNumHeaps != 0) ) @@ -1822,10 +1833,8 @@ VidMemList = (PVIDEOMEMORY) HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, (sizeof(VIDEOMEMORY) * 24 ) * pHalInfo->vmiData.dwNumHeaps); } - /* Do the query */ if ( GetDdHandle(pDirectDrawGlobal->hDD) == NULL) { - /* We failed, free the memory and return */ retVal = FALSE; goto cleanup; } @@ -1836,47 +1845,6 @@ /* Get adapter res, we can use windows own api here for we need getting the d3d support caps*/ IWineD3D_GetDeviceCaps(pWineD3d, 0, WINED3DDEVTYPE_HAL,(WINED3DCAPS *)&WineCaps); - EnumDisplaySettingsW(NULL,ENUM_CURRENT_SETTINGS,&DevMode); - - /* Dectect RGB bit mask */ - hdc = CreateDCW(L"DISPLAY", NULL, NULL, NULL); - if (hdc == NULL) - { - retVal = FALSE; - goto cleanup; - } - - hbmp = CreateCompatibleBitmap(hdc, 1, 1); - if (hbmp==NULL) - { - DeleteDC(hdc); - retVal = FALSE; - goto cleanup; - } - - pbmiData = (UCHAR *)HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, bmiSize); - pbmi = (BITMAPINFO*)pbmiData; - - if (pbmiData==NULL) - { - DeleteDC(hdc); - DeleteObject(hbmp); - retVal = FALSE; - goto cleanup; - } - - pbmi->bmiHeader.biSize = sizeof(BITMAPINFOHEADER); - pbmi->bmiHeader.biBitCount = (WORD)DevMode.dmBitsPerPel; - pbmi->bmiHeader.biCompression = BI_BITFIELDS; - pbmi->bmiHeader.biWidth = 1; - pbmi->bmiHeader.biHeight = 1; - - GetDIBits(hdc, hbmp, 0, 0, NULL, pbmi, 0); - DeleteObject(hbmp); - pMasks = (DWORD*)(pbmiData + sizeof(BITMAPINFOHEADER)); - DeleteDC(hdc); - /* End dectect RGB bit mask */ - if (pHalInfo) { /* Clear the incoming pointer */ @@ -1885,53 +1853,17 @@ /* Convert all the data */ pHalInfo->dwSize = sizeof(DDHALINFO); + IWineD3DDevice_GetDisplayMode(pD3DDevice, 0, &Mode); + GetPixelFormatData(&pHalInfo->vmiData.ddpfDisplay, Mode.Format); + pHalInfo->vmiData.fpPrimary = 0; pHalInfo->vmiData.dwFlags = 0; // MSDN Currently unused and should be set to zero. - - pHalInfo->vmiData.dwDisplayWidth = DevMode.dmPelsHeight; - pHalInfo->vmiData.dwDisplayHeight = DevMode.dmPelsWidth; - - /* ToDo align it right, we skip align it, it must be algin like the graphice card delta for the screen - * the graphice card delta is same as pHalInfo->vmiData.lDisplayPitch - */ - pHalInfo->vmiData.lDisplayPitch = (DevMode.dmPelsWidth * DevMode.dmBitsPerPel) / 8; + pHalInfo->vmiData.dwDisplayWidth = Mode.Width; + pHalInfo->vmiData.dwDisplayHeight = Mode.Height; + pHalInfo->vmiData.lDisplayPitch = (Mode.Width * pHalInfo->vmiData.ddpfDisplay.dwRGBBitCount) / 8; /* Setup DDPIXELFORMAT for pHalInfo->vmiData.ddpfDisplay */ pHalInfo->vmiData.ddpfDisplay.dwSize = sizeof(DDPIXELFORMAT); - switch(DevMode.dmBitsPerPel) - { - case 1: - pHalInfo->vmiData.ddpfDisplay.dwFlags = DDPF_PALETTEINDEXED1; - break; - - case 2: - pHalInfo->vmiData.ddpfDisplay.dwFlags = DDPF_PALETTEINDEXED2; - break; - - case 4: - pHalInfo->vmiData.ddpfDisplay.dwFlags = DDPF_PALETTEINDEXED4; - break; - - case 8: - pHalInfo->vmiData.ddpfDisplay.dwFlags = DDPF_PALETTEINDEXED8; - break; - - case 16: - case 24: - case 32: - pHalInfo->vmiData.ddpfDisplay.dwFlags = DDPF_RGB; - break; - - default: - break; - } - - pHalInfo->vmiData.ddpfDisplay.dwFourCC = 0; - pHalInfo->vmiData.ddpfDisplay.dwRGBBitCount = DevMode.dmBitsPerPel; - pHalInfo->vmiData.ddpfDisplay.dwRBitMask = pMasks[0]; - pHalInfo->vmiData.ddpfDisplay.dwGBitMask = pMasks[1]; - pHalInfo->vmiData.ddpfDisplay.dwBBitMask = pMasks[2]; - pHalInfo->vmiData.ddpfDisplay.dwRGBAlphaBitMask = pMasks[3]; /* ToDo ? align setting for wined3d */ pHalInfo->vmiData.dwOffscreenAlign = 0; @@ -1939,7 +1871,6 @@ pHalInfo->vmiData.dwTextureAlign = 0; pHalInfo->vmiData.dwZBufferAlign = 0; pHalInfo->vmiData.dwAlphaAlign = 0; - pHalInfo->vmiData.dwNumHeaps = 0; pHalInfo->vmiData.pvmList = NULL;

1 0

[jmorlan] 39611: Don't expand FOR variables until execution time, so that special characters in them won't cause unwanted syntactic effects. For example, "for %a in (^>) do echo %a" should just echo the greater than sign.
by jmorlan＠svn.reactos.org 15 Feb '09

15 Feb '09

Author: jmorlan Date: Sun Feb 15 12:18:16 2009 New Revision: 39611 URL: http://svn.reactos.org/svn/reactos?rev=39611&view=rev Log: Don't expand FOR variables until execution time, so that special characters in them won't cause unwanted syntactic effects. For example, "for %a in (^>) do echo %a" should just echo the greater than sign. Modified: trunk/reactos/base/shell/cmd/batch.c trunk/reactos/base/shell/cmd/batch.h trunk/reactos/base/shell/cmd/cmd.c trunk/reactos/base/shell/cmd/cmd.h trunk/reactos/base/shell/cmd/parser.c Modified: trunk/reactos/base/shell/cmd/batch.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/batch.c?rev… ============================================================================== --- trunk/reactos/base/shell/cmd/batch.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/batch.c [iso-8859-1] Sun Feb 15 12:18:16 2009 @@ -405,19 +405,14 @@ } /* At this point, fv points to parameter string */ + bc->forvalue = fv; + + /* Double up % signs so they will get through the parser intact */ while (*sp) { - if ((*sp == _T('%')) && (*(sp + 1) == bc->forvar)) - { - /* replace % var */ - dp = _stpcpy (dp, fv); - sp += 2; - } - else - { - /* Else just copy */ - *dp++ = *sp++; - } + if (*sp == _T('%')) + *dp++ = _T('%'); + *dp++ = *sp++; } *dp++ = _T('\n'); Modified: trunk/reactos/base/shell/cmd/batch.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/batch.h?rev… ============================================================================== --- trunk/reactos/base/shell/cmd/batch.h [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/batch.h [iso-8859-1] Sun Feb 15 12:18:16 2009 @@ -21,6 +21,7 @@ HANDLE hFind; /* Preserve find handle when doing a for */ REDIRECTION *RedirList; TCHAR forvar; + LPTSTR forvalue; } BATCH_CONTEXT, *LPBATCH_CONTEXT; 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] Sun Feb 15 12:18:16 2009 @@ -1261,19 +1261,56 @@ #undef APPEND1 } +BOOL +SubstituteForVars(TCHAR *Src, TCHAR *Dest) +{ + TCHAR *DestEnd = &Dest[CMDLINE_LENGTH - 1]; + while (*Src) + { + if (Src[0] == _T('%') && Src[1] != _T('\0')) + { + /* This might be a variable. Search the list of contexts for it */ + BATCH_CONTEXT *Ctx = bc; + while (Ctx && Ctx->forvar != Src[1]) + Ctx = Ctx->prev; + if (Ctx) + { + /* Found it */ + if (Dest + _tcslen(Ctx->forvalue) > DestEnd) + return FALSE; + Dest = _stpcpy(Dest, Ctx->forvalue); + Src += 2; + continue; + } + } + /* Not a variable; just copy the character */ + if (Dest >= DestEnd) + return FALSE; + *Dest++ = *Src++; + } + *Dest = _T('\0'); + return TRUE; +} + LPTSTR DoDelayedExpansion(LPTSTR Line) { - TCHAR Buf[CMDLINE_LENGTH]; - if (!_tcschr(Line, _T('!'))) - return cmd_dup(Line); + TCHAR Buf1[CMDLINE_LENGTH]; + TCHAR Buf2[CMDLINE_LENGTH]; + + /* First, substitute FOR variables */ + if (!SubstituteForVars(Line, Buf1)) + return NULL; + + if (!_tcschr(Buf1, _T('!'))) + return cmd_dup(Buf1); /* FIXME: Delayed substitutions actually aren't quite the same as * immediate substitutions. In particular, it's possible to escape * the exclamation point using ^. */ - if (!SubstituteVars(Line, Buf, _T('!'))) + if (!SubstituteVars(Buf1, Buf2, _T('!'))) return NULL; - return cmd_dup(Buf); + return cmd_dup(Buf2); } Modified: trunk/reactos/base/shell/cmd/cmd.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/cmd.h?rev=3… ============================================================================== --- trunk/reactos/base/shell/cmd/cmd.h [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/cmd.h [iso-8859-1] Sun Feb 15 12:18:16 2009 @@ -102,6 +102,7 @@ LPCTSTR GetEnvVarOrSpecial ( LPCTSTR varName ); VOID AddBreakHandler (VOID); VOID RemoveBreakHandler (VOID); +BOOL SubstituteForVars(TCHAR *Src, TCHAR *Dest); LPTSTR DoDelayedExpansion(LPTSTR Line); BOOL DoCommand (LPTSTR line); BOOL ReadLine(TCHAR *commandline, BOOL bMore); Modified: trunk/reactos/base/shell/cmd/parser.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/shell/cmd/parser.c?re… ============================================================================== --- trunk/reactos/base/shell/cmd/parser.c [iso-8859-1] (original) +++ trunk/reactos/base/shell/cmd/parser.c [iso-8859-1] Sun Feb 15 12:18:16 2009 @@ -610,18 +610,21 @@ return Cmd; } -/* Reconstruct a parse tree into text form; - * used for echoing batch file commands */ + +/* Reconstruct a parse tree into text form; used for echoing + * batch file commands and FOR instances. */ VOID EchoCommand(PARSED_COMMAND *Cmd) { + TCHAR Buf[CMDLINE_LENGTH]; PARSED_COMMAND *Sub; REDIRECTION *Redir; switch (Cmd->Type) { case C_COMMAND: - ConOutPrintf(_T("%s"), Cmd->Command.CommandLine); + if (SubstituteForVars(Cmd->Command.CommandLine, Buf)) + ConOutPrintf(_T("%s"), Buf); break; case C_QUIET: return; @@ -649,9 +652,11 @@ ConOutPrintf(_T(" /I")); if (Cmd->If.Flags & IFFLAG_NEGATE) ConOutPrintf(_T(" not")); - if (Cmd->If.LeftArg) - ConOutPrintf(_T(" %s"), Cmd->If.LeftArg); - ConOutPrintf(_T(" %s %s "), IfOperatorString[Cmd->If.Operator], Cmd->If.RightArg); + if (Cmd->If.LeftArg && SubstituteForVars(Cmd->If.LeftArg, Buf)) + ConOutPrintf(_T(" %s"), Buf); + ConOutPrintf(_T(" %s"), IfOperatorString[Cmd->If.Operator]); + if (SubstituteForVars(Cmd->If.RightArg, Buf)) + ConOutPrintf(_T(" %s "), Buf); Sub = Cmd->Subcommands; EchoCommand(Sub); if (Sub->Next) @@ -664,8 +669,9 @@ for (Redir = Cmd->Redirections; Redir; Redir = Redir->Next) { - ConOutPrintf(_T(" %c%s%s"), _T('0') + Redir->Number, - RedirString[Redir->Type], Redir->Filename); + if (SubstituteForVars(Redir->Filename, Buf)) + ConOutPrintf(_T(" %c%s%s"), _T('0') + Redir->Number, + RedirString[Redir->Type], Buf); } }

1 0

← Newer
1
...
18
19
20
21
22
23
24
...
56
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

Ros-diffs February 2009