Ros-diffs July 2005

ros-diffs@reactos.org

21 participants
563 discussions

[greatlrd] 16591: part1 of move bug from a volume to another have been solve, the part two are in Reactos MoveFileEx
by greatlrd＠svn.reactos.com 15 Jul '05

15 Jul '05

part1 of move bug from a volume to another have been solve, the part two are in Reactos MoveFileEx Modified: trunk/reactos/subsys/system/cmd/move.c _____ Modified: trunk/reactos/subsys/system/cmd/move.c --- trunk/reactos/subsys/system/cmd/move.c 2005-07-15 18:38:01 UTC (rev 16590) +++ trunk/reactos/subsys/system/cmd/move.c 2005-07-15 19:15:59 UTC (rev 16591) @@ -170,7 +170,7 @@ #endif if (!(dwFlags & MOVE_NOTHING)) continue; - MoveFile (szSrcPath, szDestPath); + MoveFileEx (szSrcPath, szDestPath, MOVEFILE_REPLACE_EXISTING | MOVEFILE_WRITE_THROUGH | MOVEFILE_COPY_ALLOWED); } else { @@ -208,7 +208,7 @@ /*delete the file that might be there first*/ DeleteFile(szFullDestPath); /*move the file*/ - if (MoveFile (szSrcPath, szFullDestPath)) + if (MoveFileEx (szSrcPath, szFullDestPath, MOVEFILE_REPLACE_EXISTING | MOVEFILE_WRITE_THROUGH | MOVEFILE_COPY_ALLOWED)) LoadString(CMD_ModuleHandle, STRING_MOVE_ERROR1, szMsg, RC_STRING_MAX_SIZE); else LoadString(CMD_ModuleHandle, STRING_MOVE_ERROR2, szMsg, RC_STRING_MAX_SIZE); @@ -246,7 +246,7 @@ if it was already there*/ DeleteFile(szDestPath); /*do the moving*/ - if (MoveFile (szSrcPath, szDestPath)) + if (MoveFileEx (szSrcPath, szDestPath, MOVEFILE_REPLACE_EXISTING | MOVEFILE_WRITE_THROUGH | MOVEFILE_COPY_ALLOWED)) LoadString(CMD_ModuleHandle, STRING_MOVE_ERROR1, szMsg, RC_STRING_MAX_SIZE); else LoadString(CMD_ModuleHandle, STRING_MOVE_ERROR2, szMsg, RC_STRING_MAX_SIZE);

1 0

[greatlrd] 16590: I should not write code when it is hot outside
by greatlrd＠svn.reactos.com 15 Jul '05

15 Jul '05

I should not write code when it is hot outside clean up a if statement for realloc Modified: trunk/reactos/subsys/system/cmd/copy.c _____ Modified: trunk/reactos/subsys/system/cmd/copy.c --- trunk/reactos/subsys/system/cmd/copy.c 2005-07-15 18:31:42 UTC (rev 16589) +++ trunk/reactos/subsys/system/cmd/copy.c 2005-07-15 18:38:01 UTC (rev 16590) @@ -280,7 +280,7 @@ { size = GetEnvironmentVariable (_T("COPYCMD"), evar, 512); } - if ((size > 1) && (size > 512)) + if (size > 512) { evar = realloc(evar,size * sizeof(TCHAR) ); if (evar!=NULL)

1 0

[greatlrd] 16589: in cress COPYCMD param search speed before w3seek does it
by greatlrd＠svn.reactos.com 15 Jul '05

15 Jul '05

in cress COPYCMD param search speed before w3seek does it Modified: trunk/reactos/subsys/system/cmd/copy.c _____ Modified: trunk/reactos/subsys/system/cmd/copy.c --- trunk/reactos/subsys/system/cmd/copy.c 2005-07-15 18:25:03 UTC (rev 16588) +++ trunk/reactos/subsys/system/cmd/copy.c 2005-07-15 18:31:42 UTC (rev 16589) @@ -302,57 +302,49 @@ { if (_tcsncicmp(_T("/A"),&evar[t],2)==0) { - evar[t]=_T(' '); - evar[t+1]=_T(' '); + dwFlags |=COPY_ASCII; + t++; } else if (_tcsncicmp(_T("/B"),&evar[t],2)==0) { dwFlags |= COPY_BINARY; - evar[t]=_T(' '); - evar[t+1]=_T(' '); + t++; } else if (_tcsncicmp(_T("/D"),&evar[t],2)==0) { dwFlags |= COPY_DECRYPT; - evar[t]=_T(' '); - evar[t+1]=_T(' '); + t++; } else if (_tcsncicmp(_T("/V"),&evar[t],2)==0) { dwFlags |= COPY_VERIFY; - evar[t]=_T(' '); - evar[t+1]=_T(' '); + t++; } else if (_tcsncicmp(_T("/N"),&evar[t],2)==0) { dwFlags |= COPY_SHORTNAME; - evar[t]=_T(' '); - evar[t+1]=_T(' '); + t++; } else if (_tcsncicmp(_T("/Y"),&evar[t],2)==0) { dwFlags |= COPY_NO_PROMPT; - evar[t]=_T(' '); - evar[t+1]=_T(' '); + t++; } else if (_tcsncicmp(_T("/-Y"),&evar[t],3)==0) { dwFlags |= COPY_PROMPT; - evar[t]=_T(' '); - evar[t+1]=_T(' '); - evar[t+2]=_T(' '); + t+=2; } else if (_tcsncicmp(_T("/Z"),&evar[t],2)==0) { dwFlags |= COPY_PROMPT; - evar[t]=_T(' '); - evar[t+1]=_T(' '); + t++; } } }

1 0

[greatlrd] 16588: last try to fix NULL bug
by greatlrd＠svn.reactos.com 15 Jul '05

15 Jul '05

last try to fix NULL bug Modified: trunk/reactos/subsys/system/cmd/copy.c _____ Modified: trunk/reactos/subsys/system/cmd/copy.c --- trunk/reactos/subsys/system/cmd/copy.c 2005-07-15 18:21:17 UTC (rev 16587) +++ trunk/reactos/subsys/system/cmd/copy.c 2005-07-15 18:25:03 UTC (rev 16588) @@ -276,8 +276,10 @@ /* Get the envor value if it exists */ evar = malloc(512 * sizeof(TCHAR)); if (evar==NULL) size = 0; - - size = GetEnvironmentVariable (_T("COPYCMD"), evar, 512); + else + { + size = GetEnvironmentVariable (_T("COPYCMD"), evar, 512); + } if ((size > 1) && (size > 512)) { evar = realloc(evar,size * sizeof(TCHAR) );

1 0

[greatlrd] 16587: last bugfix did forget use tchar * 512 in malloc I did only use 512 in malloc
by greatlrd＠svn.reactos.com 15 Jul '05

15 Jul '05

last bugfix did forget use tchar * 512 in malloc I did only use 512 in malloc Modified: trunk/reactos/subsys/system/cmd/copy.c _____ Modified: trunk/reactos/subsys/system/cmd/copy.c --- trunk/reactos/subsys/system/cmd/copy.c 2005-07-15 18:18:40 UTC (rev 16586) +++ trunk/reactos/subsys/system/cmd/copy.c 2005-07-15 18:21:17 UTC (rev 16587) @@ -274,7 +274,7 @@ nErrorLevel = 0; /* Get the envor value if it exists */ - evar = malloc(512); + evar = malloc(512 * sizeof(TCHAR)); if (evar==NULL) size = 0; size = GetEnvironmentVariable (_T("COPYCMD"), evar, 512);

1 0

[greatlrd] 16586: did forget check malloc and realloc was NULL and set size to zero. thx w3seek that did see this mistake
by greatlrd＠svn.reactos.com 15 Jul '05

15 Jul '05

did forget check malloc and realloc was NULL and set size to zero. thx w3seek that did see this mistake Modified: trunk/reactos/subsys/system/cmd/copy.c _____ Modified: trunk/reactos/subsys/system/cmd/copy.c --- trunk/reactos/subsys/system/cmd/copy.c 2005-07-15 17:46:26 UTC (rev 16585) +++ trunk/reactos/subsys/system/cmd/copy.c 2005-07-15 18:18:40 UTC (rev 16586) @@ -275,15 +275,22 @@ /* Get the envor value if it exists */ evar = malloc(512); - size = GetEnvironmentVariable (_T("COPYCMD"), evar, 512); - if (size > 512) + if (evar==NULL) size = 0; + + size = GetEnvironmentVariable (_T("COPYCMD"), evar, 512); + if ((size > 1) && (size > 512)) { evar = realloc(evar,size * sizeof(TCHAR) ); if (evar!=NULL) { size = GetEnvironmentVariable (_T("COPYCMD"), evar, size); } + else + { + size=0; + } } + /* check see if we did get any env variable */ if (size !=0) {

1 0

[greatlrd] 16585: implement $s
by greatlrd＠svn.reactos.com 15 Jul '05

15 Jul '05

implement $s Modified: trunk/reactos/subsys/system/cmd/prompt.c _____ Modified: trunk/reactos/subsys/system/cmd/prompt.c --- trunk/reactos/subsys/system/cmd/prompt.c 2005-07-15 17:31:12 UTC (rev 16584) +++ trunk/reactos/subsys/system/cmd/prompt.c 2005-07-15 17:46:26 UTC (rev 16585) @@ -133,8 +133,11 @@ ConOutChar (_T('=')); break; - case _T('T'): - //PrintTime (); + case _T('S'): + ConOutChar (_T(' ')); + break; + + case _T('T'): { TCHAR szTime[32]; GetTimeFormat(LOCALE_USER_DEFAULT, 0, NULL, NULL,szTime, sizeof(szTime));

1 0

[greatlrd] 16584: bug fix $t so it write out time instead for "current time is xxxxxxx" not it write the time. bug fix $h so it did jump back and erase the char that was there before.
by greatlrd＠svn.reactos.com 15 Jul '05

15 Jul '05

bug fix $t so it write out time instead for "current time is xxxxxxx" not it write the time. bug fix $h so it did jump back and erase the char that was there before. Modified: trunk/reactos/subsys/system/cmd/prompt.c _____ Modified: trunk/reactos/subsys/system/cmd/prompt.c --- trunk/reactos/subsys/system/cmd/prompt.c 2005-07-15 15:31:14 UTC (rev 16583) +++ trunk/reactos/subsys/system/cmd/prompt.c 2005-07-15 17:31:12 UTC (rev 16584) @@ -105,6 +105,8 @@ case _T('H'): ConOutChar (_T('\x08')); + ConOutChar (_T(' ')); + ConOutChar (_T('\x08')); break; case _T('L'): @@ -132,9 +134,14 @@ break; case _T('T'): - PrintTime (); + //PrintTime (); + { + TCHAR szTime[32]; + GetTimeFormat(LOCALE_USER_DEFAULT, 0, NULL, NULL,szTime, sizeof(szTime)); + ConOutPrintf("%s",szTime); + } break; - + case _T('V'): switch (osvi.dwPlatformId) { @@ -146,6 +153,7 @@ ConOutPrintf (_T("Windows 95")); break; + case VER_PLATFORM_WIN32_NT: ConOutPrintf (_T("Windows NT Version %lu.%lu"), osvi.dwMajorVersion, osvi.dwMinorVersion);

1 0

[greatlrd] 16583: crop the height of mf new logo so it show right
by greatlrd＠svn.reactos.com 15 Jul '05

15 Jul '05

crop the height of mf new logo so it show right Modified: trunk/reactos/subsys/system/explorer/res/logov.bmp Modified: trunk/reactos/subsys/system/explorer/res/logov256.bmp _____ Modified: trunk/reactos/subsys/system/explorer/res/logov.bmp (Binary files differ) _____ Modified: trunk/reactos/subsys/system/explorer/res/logov256.bmp (Binary files differ)

1 0

[hbirr] 16582: Revert my last commit (r16578).
by hbirr＠svn.reactos.com 15 Jul '05

15 Jul '05

Revert my last commit (r16578). Modified: trunk/reactos/subsys/win32k/ntuser/message.c _____ Modified: trunk/reactos/subsys/win32k/ntuser/message.c --- trunk/reactos/subsys/win32k/ntuser/message.c 2005-07-15 15:25:34 UTC (rev 16581) +++ trunk/reactos/subsys/win32k/ntuser/message.c 2005-07-15 15:30:23 UTC (rev 16582) @@ -887,7 +887,7 @@ /* Nothing found. Wait for new messages. */ Status = MsqWaitForNewMessages(ThreadQueue, Wnd, MsgFilterMin, MsgFilterMax); } - while ((STATUS_WAIT_0 >= Status && Status <= STATUS_WAIT_63) || STATUS_TIMEOUT == Status); + while ((STATUS_WAIT_0 <= Status && Status <= STATUS_WAIT_63) || STATUS_TIMEOUT == Status); SetLastNtError(Status);

1 0

← Newer
1
...
31
32
33
34
35
36
37
...
57
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 July 2005