minor build fixes for msvc

svn path=/trunk/; revision=17552

diff --git a/reactos/subsys/system/cmd/copy.c b/reactos/subsys/system/cmd/copy.c
index fbae8f8..20c5f50 100644 (file)
--- a/reactos/subsys/system/cmd/copy.c
+++ b/reactos/subsys/system/cmd/copy.c
@@ -54,7 +54,7 @@ enum
 int copy (TCHAR source[MAX_PATH], TCHAR dest[MAX_PATH], INT append, DWORD lpdwFlags, BOOL bTouch)
 {
        TCHAR szMsg[RC_STRING_MAX_SIZE];
-       FILETIME srctime;
+       FILETIME srctime,NewFileTime;
        HANDLE hFileSrc;
        HANDLE hFileDest;
        LPBYTE buffer;
@@ -66,6 +66,7 @@ int copy (TCHAR source[MAX_PATH], TCHAR dest[MAX_PATH], INT append, DWORD lpdwFl
        TCHAR TrueDest[MAX_PATH];
        TCHAR TempSrc[MAX_PATH];
        TCHAR * FileName;
+       SYSTEMTIME CurrentTime;
  
 
 #ifdef _DEBUG
@@ -84,9 +85,6 @@ int copy (TCHAR source[MAX_PATH], TCHAR dest[MAX_PATH], INT append, DWORD lpdwFl
                return 0;
        }
 
-               FILETIME NewFileTime;
-               SYSTEMTIME CurrentTime;
-
                GetSystemTime(&CurrentTime);
                SystemTimeToFileTime(&CurrentTime, &NewFileTime);
                if(SetFileTime(hFileSrc,(LPFILETIME) NULL, (LPFILETIME) NULL, &NewFileTime))

diff --git a/reactos/subsys/system/cmd/dir.c b/reactos/subsys/system/cmd/dir.c
index 983163d..4268ba6 100644 (file)
--- a/reactos/subsys/system/cmd/dir.c
+++ b/reactos/subsys/system/cmd/dir.c
@@ -1990,7 +1990,6 @@ INT CommandDir(LPTSTR first, LPTSTR rest)
        ConOutPrintf("(L) Lowercase : %i\n", stFlags.bLowerCase );
        ConOutPrintf("(N) New : %i\n", stFlags.bNewLongList );
        ConOutPrintf("(O) Order : %i\n", stFlags.stOrderBy.sCriteriaCount );
-       int i;
        for (i =0;i<stFlags.stOrderBy.sCriteriaCount;i++)
                ConOutPrintf(" Order Criteria [%i]: %i (Reversed: %i)\n",i, stFlags.stOrderBy.eCriteria[i], stFlags.stOrderBy.bCriteriaRev[i] );
        ConOutPrintf("(P) Pause : %i\n", stFlags.bPause  );

diff --git a/reactos/subsys/system/cmd/filecomp.c b/reactos/subsys/system/cmd/filecomp.c
index fc56ccf..e3f75bc 100644 (file)
--- a/reactos/subsys/system/cmd/filecomp.c
+++ b/reactos/subsys/system/cmd/filecomp.c
@@ -541,7 +541,6 @@ VOID CompleteFilename (LPTSTR strIN, BOOL bNext, LPTSTR strOut, INT cusor)
        /* Keeps track of what element was last selected */
        static INT Sel;
        BOOL NeededQuote = FALSE;
-       
        strOut[0] = _T('\0');
 
        /* Copy the string, str can be edited and orginal should not be */
@@ -677,10 +676,12 @@ VOID CompleteFilename (LPTSTR strIN, BOOL bNext, LPTSTR strOut, INT cusor)
        /* space in the name */
        if(_tcschr(FileList[Sel].Name, _T(' ')))
        {
+               INT LastSpace;
+               BOOL bInside;
                /* It needs a " at the end */
                NeededQuote = TRUE;
-               INT LastSpace = -1;
-               BOOL bInside = FALSE;
+               LastSpace = -1;
+               bInside = FALSE;
                /* Find the place to put the " at the start */
                for(i = 0; i < _tcslen(szPrefix); i++)
                {