Ros-diffs

ros-diffs@reactos.org

81390 discussions

[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

[mf] 17951: - fix build for MinGW and VC++ environments
by mf＠svn.reactos.com 20 Sep '05

20 Sep '05

- fix build for MinGW and VC++ environments - fix Manifest descriptions - ignore some immediate files Modified: trunk/reactos/subsys/system/explorer/explorer.dsp Modified: trunk/reactos/subsys/system/explorer/explorer.exe.manifest Modified: trunk/reactos/subsys/system/explorer/explorer.rc Modified: trunk/reactos/subsys/system/explorer/explorer_intres.rc Modified: trunk/reactos/subsys/system/explorer/resource.h Modified: trunk/reactos/subsys/system/explorer/taskbar/desktopbar.cpp Modified: trunk/reactos/subsys/system/explorer/taskbar/desktopbar.h Modified: trunk/reactos/subsys/system/explorer/taskbar/taskbar.cpp Property changes on: trunk/reactos/subsys/system/explorer ___________________________________________________________________ Name: svn:ignore - *.coff *.exe *.d *.o *.a *.sym *.map bin Debug Release DRelease UDebug URelease _NO_COMUTIL doxy-doc Win32 WineDll WineRelease *.ncb *.opt *.aps *.ncb *.plg *.suo buildno.h notifyhook.dll *.gch *.h.pch pack.* .gdbinit start-gdb.bat libexpat.dll GNUmakefile + *.coff *.exe *.d *.o *.a *.sym *.map bin Debug Release DRelease UDebug URelease _NO_COMUTIL doxy-doc Win32 WineDll WineRelease *.ncb *.opt *.aps *.ncb *.plg *.suo buildno.h notifyhook.dll *.gch *.h.pch pack.* .gdbinit start-gdb.bat libexpat.dll GNUmakefile *.chm *.lib _____ Modified: trunk/reactos/subsys/system/explorer/explorer.dsp --- trunk/reactos/subsys/system/explorer/explorer.dsp 2005-09-20 19:27:08 UTC (rev 17950) +++ trunk/reactos/subsys/system/explorer/explorer.dsp 2005-09-20 19:51:27 UTC (rev 17951) @@ -451,6 +451,10 @@ # End Source File # Begin Source File +SOURCE=.\explorer.exe.manifest +# End Source File +# Begin Source File + SOURCE=.\res\explorer.ico # End Source File # Begin Source File _____ Modified: trunk/reactos/subsys/system/explorer/explorer.exe.manifest --- trunk/reactos/subsys/system/explorer/explorer.exe.manifest 2005-09-20 19:27:08 UTC (rev 17950) +++ trunk/reactos/subsys/system/explorer/explorer.exe.manifest 2005-09-20 19:51:27 UTC (rev 17951) @@ -3,10 +3,10 @@ <assemblyIdentity version="1.0.0.0" processorArchitecture="X86" - name="IrfanView" + name="ReactOS.Explorer" type="win32" /> -<description>Universal picture viewer</description> +<description>ROS Excplorer</description> <dependency> <dependentAssembly> <assemblyIdentity _____ Modified: trunk/reactos/subsys/system/explorer/explorer.rc --- trunk/reactos/subsys/system/explorer/explorer.rc 2005-09-20 19:27:08 UTC (rev 17950) +++ trunk/reactos/subsys/system/explorer/explorer.rc 2005-09-20 19:51:27 UTC (rev 17951) @@ -19,7 +19,3 @@ IDS_VERSION_STR REACTOS_STR_PRODUCT_VERSION IDS_EXPLORER_VERSION_STR "ReactOS %s Explorer" END - -#define MANIFEST_RESOURCE_ID 1 - -MANIFEST_RESOURCE_ID RT_MANIFEST "explorer.exe.manifest" _____ Modified: trunk/reactos/subsys/system/explorer/explorer_intres.rc --- trunk/reactos/subsys/system/explorer/explorer_intres.rc 2005-09-20 19:27:08 UTC (rev 17950) +++ trunk/reactos/subsys/system/explorer/explorer_intres.rc 2005-09-20 19:51:27 UTC (rev 17951) @@ -85,8 +85,8 @@ 3 TEXTINCLUDE MOVEABLE PURE BEGIN "#ifndef ROSSHELL\r\n" - "IDB_IMAGES BITMAP DISCARDABLE ""res/images.bmp""\r\n" - "IDB_TOOLBAR BITMAP DISCARDABLE ""res/toolbar.bmp""\r\n" + "IDB_IMAGES BITMAP DISCARDABLE ""res/images.bmp""\r\n" + "IDB_TOOLBAR BITMAP DISCARDABLE ""res/toolbar.bmp""\r\n" "#endif\r\n" "#ifndef _ROS_\r\n" "LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL\r\n" @@ -100,6 +100,7 @@ "#endif\r\n" "END\r\n" "#endif\r\n" + "CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST DISCARDABLE PURE ""explorer.exe.manifest""\r\n" "\r\n" "#include ""explorer-en.rc""\r\n" "#include ""explorer-de.rc""\r\n" @@ -167,8 +168,8 @@ // Generated from the TEXTINCLUDE 3 resource. // #ifndef ROSSHELL -IDB_IMAGES BITMAP DISCARDABLE "res/images.bmp" -IDB_TOOLBAR BITMAP DISCARDABLE "res/toolbar.bmp" +IDB_IMAGES BITMAP DISCARDABLE "res/images.bmp" +IDB_TOOLBAR BITMAP DISCARDABLE "res/toolbar.bmp" #endif #ifndef _ROS_ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL @@ -182,11 +183,11 @@ #endif END #endif +CREATEPROCESS_MANIFEST_RESOURCE_ID RT_MANIFEST DISCARDABLE PURE "explorer.exe.manifest" #include "explorer-en.rc" #include "explorer-de.rc" #include "explorer-es.rc" -#include "explorer-fr.rc" #include "explorer-sv.rc" #include "explorer-pt.rc" #include "explorer-cz.rc" Property changes on: trunk/reactos/subsys/system/explorer/notifyhook ___________________________________________________________________ Name: svn:ignore - Debug Release *.d *.o *.a *.dll *.gch *.h.pch notifyhook.map notifyhook.sym notifyhook.coff GNUmakefile + Debug Release *.d *.o *.a *.dll *.gch *.h.pch notifyhook.map notifyhook.sym notifyhook.coff GNUmakefile Win32 _____ Modified: trunk/reactos/subsys/system/explorer/resource.h --- trunk/reactos/subsys/system/explorer/resource.h 2005-09-20 19:27:08 UTC (rev 17950) +++ trunk/reactos/subsys/system/explorer/resource.h 2005-09-20 19:51:27 UTC (rev 17951) @@ -3,6 +3,7 @@ // Used by explorer_intres.rc // #define IDS_TITLE 1 +#define MANIFEST_RESOURCE_ID 1 #define IDS_START 2 #define IDS_LOGOFF 3 #define IDS_SHUTDOWN 4 _____ Modified: trunk/reactos/subsys/system/explorer/taskbar/desktopbar.cpp --- trunk/reactos/subsys/system/explorer/taskbar/desktopbar.cpp 2005-09-20 19:27:08 UTC (rev 17950) +++ trunk/reactos/subsys/system/explorer/taskbar/desktopbar.cpp 2005-09-20 19:51:27 UTC (rev 17951) @@ -273,13 +273,17 @@ int DesktopBar::Notify(int id, NMHDR* pnmh) { - if (pnmh->code == RBN_CHILDSIZE) { - /* align the task bands to the top, so it's in row with the Start button */ - NMREBARCHILDSIZE *childSize = (NMREBARCHILDSIZE*)pnmh; + if (pnmh->code == RBN_CHILDSIZE) { + /* align the task bands to the top, so it's in row with the Start button */ + NMREBARCHILDSIZE* childSize = (NMREBARCHILDSIZE*)pnmh; + if (childSize->wID == IDW_TASKTOOLBAR) { int cy = childSize->rcChild.top - childSize->rcBand.top; - childSize->rcChild.bottom -= cy; - childSize->rcChild.top -= cy; + + if (cy) { + childSize->rcChild.bottom -= cy; + childSize->rcChild.top -= cy; + } } } _____ Modified: trunk/reactos/subsys/system/explorer/taskbar/desktopbar.h --- trunk/reactos/subsys/system/explorer/taskbar/desktopbar.h 2005-09-20 19:27:08 UTC (rev 17950) +++ trunk/reactos/subsys/system/explorer/taskbar/desktopbar.h 2005-09-20 19:51:27 UTC (rev 17951) @@ -31,7 +31,7 @@ #define DESKTOPBARBAR_HEIGHT (GetSystemMetrics(SM_CYSIZE) + 5 * GetSystemMetrics(SM_CYEDGE)) -#define REBARBAND_HEIGHT (GetSystemMetrics(SM_CYSIZE) + 2 * GetSystemMetrics(SM_CYEDGE)) +#define REBARBAND_HEIGHT (GetSystemMetrics(SM_CYSIZE) + 2 * GetSystemMetrics(SM_CYEDGE)) #define IDC_START 0x1000 _____ Modified: trunk/reactos/subsys/system/explorer/taskbar/taskbar.cpp --- trunk/reactos/subsys/system/explorer/taskbar/taskbar.cpp 2005-09-20 19:27:08 UTC (rev 17950) +++ trunk/reactos/subsys/system/explorer/taskbar/taskbar.cpp 2005-09-20 19:51:27 UTC (rev 17951) @@ -29,7 +29,7 @@ #include <precomp.h> #include "taskbar.h" -#include "traynotify.h" // for NOTIFYAREA_WIDTH_DEF +#include "traynotify.h" // for NOTIFYAREA_WIDTH_DEF DynamicFct<BOOL (WINAPI*)(HWND hwnd)> g_SetTaskmanWindow(TEXT("user32"), "SetTaskmanWindow"); @@ -118,8 +118,6 @@ LRESULT TaskBar::Init(LPCREATESTRUCT pcs) { - TBMETRICS metrics; - if (super::Init(pcs)) return 1; @@ -135,13 +133,19 @@ //SetWindowFont(_htoolbar, GetStockFont(ANSI_VAR_FONT), FALSE); //SendMessage(_htoolbar, TB_SETPADDING, 0, MAKELPARAM(8,8)); +#ifndef __MINGW32__ // TBMETRICS missing in MinGW (as of 20.09.2005) + // set metrics for the Taskbar toolbar to enable button spacing + TBMETRICS metrics; + metrics.cbSize = sizeof(TBMETRICS); metrics.dwMask = TBMF_BARPAD | TBMF_BUTTONSPACING; metrics.cxBarPad = 0; metrics.cyBarPad = 0; metrics.cxButtonSpacing = 3; metrics.cyButtonSpacing = 3; + SendMessage(_htoolbar, TB_SETMETRICS, 0, (LPARAM)&metrics); +#endif _next_id = IDC_FIRST_APP; @@ -392,8 +396,7 @@ HICON hIcon = get_window_icon_small(hwnd); BOOL delete_icon = FALSE; - if (!hIcon) - { + if (!hIcon) { hIcon = LoadIcon(0, IDI_APPLICATION); delete_icon = TRUE; }

1 0

[royce] 17950: unrevert change - this change is correct and works in windows
by royce＠svn.reactos.com 20 Sep '05

20 Sep '05

unrevert change - this change is correct and works in windows 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 18:11:55 UTC (rev 17949) +++ trunk/reactos/subsys/system/cmd/choice.c 2005-09-20 19:27:08 UTC (rev 17950) @@ -254,7 +254,11 @@ { val = IsKeyInString (lpOptions, +#ifdef _UNICODE ir.Event.KeyEvent.uChar.UnicodeChar, +#else + ir.Event.KeyEvent.uChar.AsciiChar, +#endif bCaseSensitive); }

1 0

[greatlrd] 17949: Revert royce3 change from 17948 to 16488 it break choice in bat files, in some case.
by greatlrd＠svn.reactos.com 20 Sep '05

20 Sep '05

Revert royce3 change from 17948 to 16488 it break choice in bat files, in some case. 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 16:38:02 UTC (rev 17948) +++ trunk/reactos/subsys/system/cmd/choice.c 2005-09-20 18:11:55 UTC (rev 17949) @@ -254,11 +254,7 @@ { val = IsKeyInString (lpOptions, -#ifdef _UNICODE ir.Event.KeyEvent.uChar.UnicodeChar, -#else - ir.Event.KeyEvent.uChar.AsciiChar, -#endif bCaseSensitive); }

1 0

[royce] 17948: cmd's documentation says that env variables override the "built-ins" like %errorlevel% and such.
by royce＠svn.reactos.com 20 Sep '05

20 Sep '05

cmd's documentation says that env variables override the "built-ins" like %errorlevel% and such. also fixed a couple msvc6 warnings and added a little documentation to the set/a code Modified: trunk/reactos/subsys/system/cmd/choice.c Modified: trunk/reactos/subsys/system/cmd/cmd.c Modified: trunk/reactos/subsys/system/cmd/cmd.h Modified: trunk/reactos/subsys/system/cmd/misc.c Modified: trunk/reactos/subsys/system/cmd/precomp.h Modified: trunk/reactos/subsys/system/cmd/set.c _____ Modified: trunk/reactos/subsys/system/cmd/choice.c --- trunk/reactos/subsys/system/cmd/choice.c 2005-09-20 10:45:27 UTC (rev 17947) +++ trunk/reactos/subsys/system/cmd/choice.c 2005-09-20 16:38:02 UTC (rev 17948) @@ -254,7 +254,11 @@ { val = IsKeyInString (lpOptions, +#ifdef _UNICODE ir.Event.KeyEvent.uChar.UnicodeChar, +#else + ir.Event.KeyEvent.uChar.AsciiChar, +#endif bCaseSensitive); } _____ Modified: trunk/reactos/subsys/system/cmd/cmd.c --- trunk/reactos/subsys/system/cmd/cmd.c 2005-09-20 10:45:27 UTC (rev 17947) +++ trunk/reactos/subsys/system/cmd/cmd.c 2005-09-20 16:38:02 UTC (rev 17948) @@ -142,6 +142,7 @@ */ #include <precomp.h> +#include <malloc.h> #include "resource.h" #ifndef NT_SUCCESS @@ -1061,7 +1062,189 @@ #endif /* FEATURE_REDIRECTION */ } +BOOL +GrowIfNecessary ( UINT needed, LPTSTR* ret, UINT* retlen ) +{ + if ( *ret && needed < *retlen ) + return TRUE; + *retlen = needed; + if ( *ret ) + free ( *ret ); + *ret = (LPTSTR)malloc ( *retlen * sizeof(TCHAR) ); + if ( !*ret ) + SetLastError ( ERROR_OUTOFMEMORY ); + return *ret != NULL; +} +LPCTSTR +GetParsedEnvVar ( LPCTSTR envName, UINT* envNameLen ) +{ + 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 ); + if ( size > retlen ) + { + if ( !GrowIfNecessary ( size, &ret, &retlen ) ) + return NULL; + size = GetEnvironmentVariable ( envName, ret, retlen ); + } + if ( size ) + return ret; + + /* env var doesn't exist, look for a "special" one */ + /* %CD% */ + if (_tcsicmp(envName,_T("cd")) ==0) + { + size = GetCurrentDirectory ( retlen, ret ); + if ( size > retlen ) + { + if ( !GrowIfNecessary ( size, &ret, &retlen ) ) + return NULL; + size = GetCurrentDirectory ( retlen, ret ); + } + if ( !size ) + return NULL; + return ret; + } + /* %TIME% */ + else if (_tcsicmp(envName,_T("time")) ==0) + { + SYSTEMTIME t; + if ( !GrowIfNecessary ( MAX_PATH, &ret, &retlen ) ) + return NULL; + GetSystemTime(&t); + _sntprintf ( ret, retlen, _T("%02d%c%02d%c%02d%c%02d"), + t.wHour, cTimeSeparator, t.wMinute, cTimeSeparator, + t.wSecond, cDecimalSeparator, t.wMilliseconds ); + return ret; + } + /* %DATE% */ + else if (_tcsicmp(envName,_T("date")) ==0) + { + if ( !GrowIfNecessary ( MAX_PATH, &ret, &retlen ) ) + return NULL; + size = GetDateFormat(LOCALE_USER_DEFAULT, 0, NULL, _T("ddd"), ret, retlen ); + /* TODO FIXME - test whether GetDateFormat() can return a value indicating the buffer wasn't big enough */ + if ( !size ) + return NULL; + tmp = ret + _tcslen(ret); + *tmp++ = _T(' '); + size = GetDateFormat(LOCALE_USER_DEFAULT, DATE_SHORTDATE, NULL, NULL, tmp, retlen-(tmp-ret)); + /* TODO FIXME - test whether GetDateFormat() can return a value indicating the buffer wasn't big enough */ + if ( !size ) + return NULL; + return ret; + } + + /* %RANDOM% */ + else if (_tcsicmp(envName,_T("random")) ==0) + { + if ( !GrowIfNecessary ( MAX_PATH, &ret, &retlen ) ) + return NULL; + /* Get random number */ + _itot(rand(),ret,10); + return ret; + } + + /* %CMDCMDLINE% */ + else if (_tcsicmp(envName,_T("cmdcmdline")) ==0) + { + return GetCommandLine(); + } + + /* %CMDEXTVERSION% */ + else if (_tcsicmp(envName,_T("cmdextversion")) ==0) + { + if ( !GrowIfNecessary ( MAX_PATH, &ret, &retlen ) ) + return NULL; + /* Set version number to 2 */ + _itot(2,ret,10); + return ret; + } + + /* %ERRORLEVEL% */ + else if (_tcsicmp(envName,_T("errorlevel")) ==0) + { + if ( !GrowIfNecessary ( MAX_PATH, &ret, &retlen ) ) + return NULL; + _itot(nErrorLevel,ret,10); + return ret; + } + + return _T(""); /* not found - return empty string */ +} + + /* * do the prompt/input/process loop * @@ -1072,7 +1255,6 @@ { TCHAR commandline[CMDLINE_LENGTH]; TCHAR readline[CMDLINE_LENGTH]; - LPTSTR tp = NULL; LPTSTR ip; LPTSTR cp; LPCTSTR tmp; @@ -1100,165 +1282,14 @@ bSubstitute = TRUE; while (*ip) { - if (bSubstitute && *ip == _T('%')) + if ( bSubstitute && *ip == _T('%') ) { - switch (*++ip) - { - case _T('%'): - *cp++ = *ip++; - break; - - 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 ((tp = FindArg (*ip - _T('0')))) - { - cp = _stpcpy (cp, tp); - ip++; - } - else - *cp++ = _T('%'); - break; - - case _T('?'): - cp += _stprintf (cp, _T("%u"), nErrorLevel); - ip++; - break; - - default: - tp = _tcschr(ip, _T('%')); - if ((tp != NULL) && - (tp <= _tcschr(ip, _T(' ')) - 1)) - { - INT size = 512; - TCHAR *evar; - *tp = _T('\0'); - - /* FIXME: Correct error handling when it can not alloc memmory */ - - /* %CD% */ - if (_tcsicmp(ip,_T("cd")) ==0) - { - TCHAR szPath[MAX_PATH]; - GetCurrentDirectory (MAX_PATH, szPath); - cp = _stpcpy (cp, szPath); - } - /* %TIME% */ - else if (_tcsicmp(ip,_T("time")) ==0) - { - TCHAR szTime[40]; - SYSTEMTIME t; - GetSystemTime(&t); - - _sntprintf(szTime ,40,_T("%02d%c%02d%c%02d%c%02d"), t.wHour, cTimeSeparator,t.wMinute , cTimeSeparator,t.wSecond , cDecimalSeparator, t.wMilliseconds ); - cp = _stpcpy (cp, szTime); - } - - /* %DATE% */ - else if (_tcsicmp(ip,_T("date")) ==0) - { - TCHAR szDate[40]; - - GetDateFormat(LOCALE_USER_DEFAULT, 0, NULL, _T("ddd"), szDate, sizeof (szDate)); - cp = _stpcpy (cp, szDate); - cp = _stpcpy (cp, _T(" ")); - GetDateFormat(LOCALE_USER_DEFAULT, DATE_SHORTDATE, NULL, NULL, szDate, sizeof (szDate)); - cp = _stpcpy (cp, szDate); - } - - /* %RANDOM% */ - else if (_tcsicmp(ip,_T("random")) ==0) - { - TCHAR szRand[40]; - /* Get random number */ - _itot(rand(),szRand,10); - cp = _stpcpy (cp, szRand); - } - - /* %CMDCMDLINE% */ - else if (_tcsicmp(ip,_T("cmdcmdline")) ==0) - { - TCHAR *pargv; - /* Get random number */ - pargv = GetCommandLine(); - cp = _stpcpy (cp, pargv); - } - - /* %CMDEXTVERSION% */ - else if (_tcsicmp(ip,_T("cmdextversion")) ==0) - { - TCHAR szVER[40]; - /* Set version number to 2 */ - _itot(2,szVER,10); - cp = _stpcpy (cp, szVER); - } - - /* %ERRORLEVEL% */ - else if (_tcsicmp(ip,_T("errorlevel")) ==0) - { - evar = malloc ( size * sizeof(TCHAR)); - if (evar==NULL) - return 1; - - memset(evar,0,512 * sizeof(TCHAR)); - _itot(nErrorLevel,evar,10); - cp = _stpcpy (cp, evar); - - free(evar); - } - else - { - evar = malloc ( 512 * sizeof(TCHAR)); - if (evar==NULL) - return 1; - SetLastError(0); - size = GetEnvironmentVariable (ip, evar, 512); - if(GetLastError() == ERROR_ENVVAR_NOT_FOUND) - { - /* if no env var is found you must - continue with what was input*/ - cp = _stpcpy (cp, _T("%")); - cp = _stpcpy (cp, ip); - cp = _stpcpy (cp, _T("%")); - } - else - { - if (size > 512) - { - evar = realloc(evar,size * sizeof(TCHAR) ); - if (evar==NULL) - { - return 1; - } - size = GetEnvironmentVariable (ip, evar, size); - } - - if (size) - { - cp = _stpcpy (cp, evar); - } - } - - free(evar); - } - - ip = tp + 1; - - } - else - { - *cp++ = _T('%'); - } - - break; - } + UINT envNameLen; + LPCTSTR envVal = GetParsedEnvVar ( ip, &envNameLen ); + if ( !envVal ) + return 1; + ip += envNameLen; + cp = _stpcpy ( cp, envVal ); continue; } _____ Modified: trunk/reactos/subsys/system/cmd/cmd.h --- trunk/reactos/subsys/system/cmd/cmd.h 2005-09-20 10:45:27 UTC (rev 17947) +++ trunk/reactos/subsys/system/cmd/cmd.h 2005-09-20 16:38:02 UTC (rev 17948) @@ -299,7 +299,7 @@ BOOL CheckCtrlBreak (INT); LPTSTR *split (LPTSTR, LPINT, BOOL); VOID freep (LPTSTR *); -LPTSTR _stpcpy (LPTSTR, LPTSTR); +LPTSTR _stpcpy (LPTSTR, LPCTSTR); BOOL IsValidPathName (LPCTSTR); BOOL IsExistingFile (LPCTSTR); BOOL IsExistingDirectory (LPCTSTR); _____ Modified: trunk/reactos/subsys/system/cmd/misc.c --- trunk/reactos/subsys/system/cmd/misc.c 2005-09-20 10:45:27 UTC (rev 17947) +++ trunk/reactos/subsys/system/cmd/misc.c 2005-09-20 16:38:02 UTC (rev 17948) @@ -322,7 +322,7 @@ } -LPTSTR _stpcpy (LPTSTR dest, LPTSTR src) +LPTSTR _stpcpy (LPTSTR dest, LPCTSTR src) { _tcscpy (dest, src); return (dest + _tcslen (src)); _____ Modified: trunk/reactos/subsys/system/cmd/precomp.h --- trunk/reactos/subsys/system/cmd/precomp.h 2005-09-20 10:45:27 UTC (rev 17947) +++ trunk/reactos/subsys/system/cmd/precomp.h 2005-09-20 16:38:02 UTC (rev 17948) @@ -1,3 +1,9 @@ +#ifdef _MSC_VER +#pragma warning ( disable : 4103 ) /* use #pragma pack to change alignment */ +#endif//_MSC_VER + +#include <stdlib.h> + #include <windows.h> #include <winnt.h> #include <shellapi.h> @@ -8,7 +14,6 @@ #include <ctype.h> #include <string.h> #include <stdio.h> -#include <stdlib.h> #include <stdarg.h> #include <math.h> #include <time.h> _____ Modified: trunk/reactos/subsys/system/cmd/set.c --- trunk/reactos/subsys/system/cmd/set.c 2005-09-20 10:45:27 UTC (rev 17947) +++ trunk/reactos/subsys/system/cmd/set.c 2005-09-20 16:38:02 UTC (rev 17948) @@ -103,9 +103,10 @@ return 0; } + /* the /A does *NOT* have to be followed by a whitespace */ if ( !_tcsnicmp (param, _T("/A"), 2) ) { - // TODO FIXME - what are we supposed to return? + /* TODO FIXME - what are we supposed to return? */ return seta_eval ( skip_ws(param+2) ); }

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