Ros-diffs

ros-diffs@reactos.org

81390 discussions

[cwittich] 32096: support for adding and deleting macros doskey macroname=command doskey macroname=
by cwittich＠svn.reactos.org 02 Feb '08

02 Feb '08

Author: cwittich Date: Sun Feb 3 00:32:11 2008 New Revision: 32096 URL: http://svn.reactos.org/svn/reactos?rev=32096&view=rev Log: support for adding and deleting macros doskey macroname=command doskey macroname= Modified: trunk/reactos/base/applications/cmdutils/doskey/doskey.c Modified: trunk/reactos/base/applications/cmdutils/doskey/doskey.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/doskey/doskey.c (original) +++ trunk/reactos/base/applications/cmdutils/doskey/doskey.c Sun Feb 3 00:32:11 2008 @@ -1,6 +1,17 @@ #include <windows.h> #include <stdio.h> #include <tchar.h> + +static VOID +partstrlwr (LPTSTR str) +{ + LPTSTR c = str; + while (*c && !_istspace (*c) && *c != _T('=')) + { + *c = _totlower (*c); + c++; + } +} static VOID PrintAlias (VOID) @@ -34,6 +45,29 @@ HeapFree(GetProcessHeap(), 0 , ptr); } +INT SetMacro (LPTSTR param) +{ + LPTSTR ptr; + + /* error if no '=' found */ + if ((ptr = _tcschr (param, _T('='))) == 0) + { + return 1; + } + + /* Split rest into name and substitute */ + *ptr++ = _T('\0'); + + partstrlwr (param); + + if (ptr[0] == _T('\0')) + AddConsoleAlias(param, NULL, _T("cmd.exe")); + else + AddConsoleAlias(param, ptr, _T("cmd.exe")); + + return 0; +} + int main (int argc, char **argv) { @@ -48,7 +82,7 @@ } else { - /* FIXME */ + SetMacro(argv[1]); }

1 0

[cwittich] 32095: add doskey to bootcd
by cwittich＠svn.reactos.org 02 Feb '08

02 Feb '08

Author: cwittich Date: Sun Feb 3 00:26:26 2008 New Revision: 32095 URL: http://svn.reactos.org/svn/reactos?rev=32095&view=rev Log: add doskey to bootcd Modified: trunk/reactos/boot/bootdata/packages/reactos.dff Modified: trunk/reactos/boot/bootdata/packages/reactos.dff URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/bootdata/packages/rea… ============================================================================== --- trunk/reactos/boot/bootdata/packages/reactos.dff (original) +++ trunk/reactos/boot/bootdata/packages/reactos.dff Sun Feb 3 00:26:26 2008 @@ -34,6 +34,7 @@ base\applications\calc\calc.exe 1 base\applications\charmap\charmap.exe 1 base\applications\cmdutils\dbgprint\dbgprint.exe 1 +base\applications\cmdutils\doskey\doskey.exe 1 base\applications\cmdutils\find\find.exe 1 base\applications\cmdutils\more\more.exe 1 base\applications\cmdutils\xcopy\xcopy.exe 1

1 0

[cwittich] 32094: add doskey (not finished yet)
by cwittich＠svn.reactos.org 02 Feb '08

02 Feb '08

Author: cwittich Date: Sun Feb 3 00:23:38 2008 New Revision: 32094 URL: http://svn.reactos.org/svn/reactos?rev=32094&view=rev Log: add doskey (not finished yet) Added: trunk/reactos/base/applications/cmdutils/doskey/ trunk/reactos/base/applications/cmdutils/doskey/doskey.c (with props) trunk/reactos/base/applications/cmdutils/doskey/doskey.rbuild (with props) trunk/reactos/base/applications/cmdutils/doskey/doskey.rc (with props) Modified: trunk/reactos/base/applications/cmdutils/cmdutils.rbuild Modified: trunk/reactos/base/applications/cmdutils/cmdutils.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/cmdutils.rbuild (original) +++ trunk/reactos/base/applications/cmdutils/cmdutils.rbuild Sun Feb 3 00:23:38 2008 @@ -3,6 +3,9 @@ <group xmlns:xi="http://www.w3.org/2001/XInclude"> <directory name="dbgprint"> <xi:include href="dbgprint/dbgprint.rbuild" /> + </directory> + <directory name="doskey"> + <xi:include href="doskey/doskey.rbuild" /> </directory> <directory name="find"> <xi:include href="find/find.rbuild" /> Added: trunk/reactos/base/applications/cmdutils/doskey/doskey.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/doskey/doskey.c (added) +++ trunk/reactos/base/applications/cmdutils/doskey/doskey.c Sun Feb 3 00:23:38 2008 @@ -1,0 +1,58 @@ +#include <windows.h> +#include <stdio.h> +#include <tchar.h> + +static VOID +PrintAlias (VOID) +{ + LPTSTR Aliases; + LPTSTR ptr; + DWORD len; + + len = GetConsoleAliasesLength(_T("cmd.exe")); + if (len <= 0) + return; + + /* allocate memory for an extra \0 char to make parsing easier */ + ptr = HeapAlloc(GetProcessHeap(), 0, (len + sizeof(TCHAR))); + if (!ptr) + return; + + Aliases = ptr; + + ZeroMemory(Aliases, len + sizeof(TCHAR)); + + if (GetConsoleAliases(Aliases, len, _T("cmd.exe")) != 0) + { + while (*Aliases != '\0') + { + printf(_T("%s\n"), Aliases); + Aliases = Aliases + lstrlen(Aliases); + Aliases++; + } + } + HeapFree(GetProcessHeap(), 0 , ptr); +} + +int +main (int argc, char **argv) +{ + + if (argc < 2) + return 0; + + if (argv[1][0] == '/') + { + if (stricmp(argv[1], "/macros") == 0) + PrintAlias(); + } + else + { + /* FIXME */ + } + + + + return 0; +} + Propchange: trunk/reactos/base/applications/cmdutils/doskey/doskey.c ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/cmdutils/doskey/doskey.rbuild URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/doskey/doskey.rbuild (added) +++ trunk/reactos/base/applications/cmdutils/doskey/doskey.rbuild Sun Feb 3 00:23:38 2008 @@ -1,0 +1,9 @@ +<?xml version="1.0"?> +<!DOCTYPE module SYSTEM "../../../../tools/rbuild/project.dtd"> +<module name="doskey" type="win32cui" installbase="system32" installname="doskey.exe"> + <define name="_WIN32_IE">0x0501</define> + <define name="_WIN32_WINNT">0x0501</define> + <library>kernel32</library> + <file>doskey.c</file> + <file>doskey.rc</file> +</module> Propchange: trunk/reactos/base/applications/cmdutils/doskey/doskey.rbuild ------------------------------------------------------------------------------ svn:eol-style = native Added: trunk/reactos/base/applications/cmdutils/doskey/doskey.rc URL: http://svn.reactos.org/svn/reactos/trunk/reactos/base/applications/cmdutils… ============================================================================== --- trunk/reactos/base/applications/cmdutils/doskey/doskey.rc (added) +++ trunk/reactos/base/applications/cmdutils/doskey/doskey.rc Sun Feb 3 00:23:38 2008 @@ -1,0 +1,7 @@ +/* $Id: find.rc 28350 2007-08-15 14:46:36Z fireball $ */ + +#define REACTOS_STR_FILE_DESCRIPTION "W32 doskey command\0" +#define REACTOS_STR_INTERNAL_NAME "doskey\0" +#define REACTOS_STR_ORIGINAL_FILENAME "doskey.exe\0" +#include <reactos/version.rc> + Propchange: trunk/reactos/base/applications/cmdutils/doskey/doskey.rc ------------------------------------------------------------------------------ svn:eol-style = native

1 0

[cwittich] 32093: rewrote alias handling in cmd for doskey compatibility implemented AddConsoleAliasA, GetConsoleAliasesLengthA, GetConsoleAliasesLengthW halfplemented: AddConsoleAliasW, GetConsoleAliasW, GetConsoleAliasesW
by cwittich＠svn.reactos.org 02 Feb '08

02 Feb '08

Author: cwittich Date: Sun Feb 3 00:06:53 2008 New Revision: 32093 URL: http://svn.reactos.org/svn/reactos?rev=32093&view=rev Log: rewrote alias handling in cmd for doskey compatibility implemented AddConsoleAliasA, GetConsoleAliasesLengthA, GetConsoleAliasesLengthW halfplemented: AddConsoleAliasW, GetConsoleAliasW, GetConsoleAliasesW Modified: trunk/reactos/base/shell/cmd/alias.c trunk/reactos/base/shell/cmd/cmd.c trunk/reactos/base/shell/cmd/cmd.h trunk/reactos/dll/win32/kernel32/misc/console.c trunk/reactos/include/psdk/wincon.h 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 (original) +++ trunk/reactos/base/shell/cmd/alias.c Sun Feb 3 00:06:53 2008 @@ -27,26 +27,15 @@ * * 02-Apr-2005 (Magnus Olsen) <magnus(a)greatlord.com>) * Remove all hardcode string to En.rc - */ + * + * 02-Feb-2008 (Christoph von Wittich) <christoph_vw(a)reactos.org>) + * rewrote alias handling for doskey compat + */ #include <precomp.h> #ifdef FEATURE_ALIASES - -typedef struct tagALIAS -{ - struct tagALIAS *next; - LPTSTR lpName; - LPTSTR lpSubst; - DWORD dwUsed; -} ALIAS, *LPALIAS; - - -static LPALIAS lpFirst = NULL; -static LPALIAS lpLast = NULL; -static DWORD dwUsed = 0; - /* module internal functions */ /* strlwr only for first word in string */ @@ -61,245 +50,117 @@ } } - static VOID PrintAlias (VOID) { - LPALIAS ptr = lpFirst; - while (ptr) - { - ConOutPrintf (_T("%s=%s\n"), ptr->lpName, ptr->lpSubst); - ptr = ptr->next; - } -} - - -static VOID -DeleteAlias (LPTSTR pszName) -{ - LPALIAS ptr = lpFirst; - LPALIAS prev = NULL; - - while (ptr) - { - if (!_tcsicmp (ptr->lpName, pszName)) + LPTSTR Aliases; + LPTSTR ptr; + DWORD len; + + len = GetConsoleAliasesLength(_T("cmd.exe")); + if (len <= 0) + return; + + /* allocate memory for an extra \0 char to make parsing easier */ + ptr = cmd_alloc(len + sizeof(TCHAR)); + if (!ptr) + return; + + Aliases = ptr; + + ZeroMemory(Aliases, len + sizeof(TCHAR)); + + if (GetConsoleAliases(Aliases, len, _T("cmd.exe")) != 0) + { + while (*Aliases != '\0') { - if (prev) - prev->next = ptr->next; - else - lpFirst = ptr->next; - cmd_free (ptr->lpName); - cmd_free (ptr->lpSubst); - cmd_free (ptr); - return; + ConOutPrintf(_T("%s\n"), Aliases); + Aliases = Aliases + lstrlen(Aliases); + Aliases++; } - prev = ptr; - ptr = ptr->next; - } -} - - -static VOID -AddAlias (LPTSTR name, LPTSTR subst) -{ - LPALIAS ptr = lpFirst; - LPALIAS prev, entry; - LPTSTR s; - - while (ptr) - { - if (!_tcsicmp (ptr->lpName, name)) - { - s = (LPTSTR)cmd_alloc ((_tcslen (subst) + 1)*sizeof(TCHAR)); - if (!s) - { - error_out_of_memory (); - return; - } - - cmd_free (ptr->lpSubst); - ptr->lpSubst = s; - _tcscpy (ptr->lpSubst, subst); - return; - } - ptr = ptr->next; - } - - ptr = (LPALIAS)cmd_alloc (sizeof (ALIAS)); - if (!ptr) - return; - - ptr->next = 0; - - ptr->lpName = (LPTSTR)cmd_alloc ((_tcslen (name) + 1)*sizeof(TCHAR)); - if (!ptr->lpName) - { - error_out_of_memory (); - cmd_free (ptr); - return; - } - _tcscpy (ptr->lpName, name); - - ptr->lpSubst = (LPTSTR)cmd_alloc ((_tcslen (subst) + 1)*sizeof(TCHAR)); - if (!ptr->lpSubst) - { - error_out_of_memory (); - cmd_free (ptr->lpName); - cmd_free (ptr); - return; - } - _tcscpy (ptr->lpSubst, subst); - - /* it's necessary for recursive substitution */ - partstrlwr (ptr->lpSubst); - - ptr->dwUsed = 0; - - /* Alias table must be sorted! - * Here a little example: - * command line = "ls -c" - * If the entries are - * ls=dir - * ls -c=ls /w - * command line will be expanded to "dir -c" which is not correct. - * If the entries are sortet as - * ls -c=ls /w - * ls=dir - * it will be expanded to "dir /w" which is a valid DOS command. - */ - entry = lpFirst; - prev = 0; - while (entry) - { - if (_tcsicmp (ptr->lpName, entry->lpName) > 0) - { - if (prev) - { - prev->next = ptr; - ptr->next = entry; - } - else - { - ptr->next = entry; - lpFirst = ptr; - } - return; - } - prev = entry; - entry = entry->next; - } - - /* The new entry is the smallest (or the first) and must be - * added to the end of the list. - */ - if (!lpFirst) - lpFirst = ptr; - else - lpLast->next = ptr; - lpLast = ptr; - - return; -} - - -VOID InitializeAlias (VOID) -{ - lpFirst = NULL; - lpLast = NULL; - dwUsed = 0; -} - -VOID DestroyAlias (VOID) -{ - if (lpFirst == NULL) - return; - - while (lpFirst->next != NULL) - { - lpLast = lpFirst; - lpFirst = lpLast->next; - - cmd_free (lpLast->lpName); - cmd_free (lpLast->lpSubst); - cmd_free (lpLast); - } - - cmd_free (lpFirst->lpName); - cmd_free (lpFirst->lpSubst); - cmd_free (lpFirst); - - lpFirst = NULL; - lpLast = NULL; - dwUsed = 0; + } + cmd_free(ptr); } /* specified routines */ VOID ExpandAlias (LPTSTR cmd, INT maxlen) { - unsigned n = 0, - m, - i, - len; - short d = 1; - LPALIAS ptr = lpFirst; - - dwUsed++; - if (dwUsed == 0) - { - while (ptr) - ptr->dwUsed = 0; - ptr = lpFirst; - dwUsed = 1; - } - - /* skipping white spaces */ - while (_istspace (cmd[n])) - n++; - - partstrlwr (&cmd[n]); - - if (!_tcsncmp (&cmd[n], _T("NOALIAS"), 7) && - (_istspace (cmd[n + 7]) || cmd[n + 7] == _T('\0'))) - { - memmove (cmd, &cmd[n + 7], (_tcslen (&cmd[n + 7]) + 1) * sizeof (TCHAR)); - return; - } - - /* substitution loop */ - while (d) - { - d = 0; - while (ptr) + LPTSTR buffer; + TCHAR* position; + LPTSTR Token; + LPTSTR tmp; + LPTSTR ip, cp; + BOOL bModeSetA = FALSE; + + tmp = cmd_alloc(maxlen); + if (!tmp) + return; + _tcscpy(tmp, cmd); + + Token = _tcstok(tmp, _T(" ")); /* first part is the macro name */ + if (!Token) + { + cmd_free(tmp); + return; + } + + buffer = cmd_alloc(maxlen); + if (!buffer) + { + cmd_free(tmp); + return; + } + + if (GetConsoleAlias(Token, buffer, maxlen, _T("cmd.exe")) == 0) + { + cmd_free(tmp); + cmd_free(buffer); + return; + } + + Token = _tcstok (NULL, _T(" ")); + + ZeroMemory(cmd, maxlen); + position = _tcsstr(buffer, _T("$*")); + if (position) + { + _tcsncpy(cmd, buffer, (INT) (position - buffer) - 1); + if (Token) { - len = _tcslen (ptr->lpName); - if (!_tcsncmp (&cmd[n], ptr->lpName, len) && - (_istspace (cmd[n + len]) || cmd[n + len] == _T('\0')) && - ptr->dwUsed != dwUsed) + _tcscat(cmd, _T(" ")); + _tcscat(cmd, Token); + } + } + else + { + _tcscpy(cmd, buffer); + } + + ip = cp = cmd; + + while (*ip) + { + if ( (*ip == _T('%')) || (*ip == _T('!')) ) + { + UINT envNameLen; + LPCTSTR envVal = GetParsedEnvVar ( ip, &envNameLen, bModeSetA ); + if ( envVal ) { - m = _tcslen (ptr->lpSubst); - if ((int)(_tcslen (cmd) - len + m - n) > maxlen) - { - ConErrResPuts(STRING_ALIAS_ERROR); - - /* the parser won't cause any problems with an empty line */ - cmd[0] = _T('\0'); - } - else - { - memmove (&cmd[m], &cmd[n + len], (_tcslen(&cmd[n + len]) + 1) * sizeof (TCHAR)); - for (i = 0; i < m; i++) - cmd[i] = ptr->lpSubst[i]; - ptr->dwUsed = dwUsed; - /* whitespaces are removed! */ - n = 0; - d = 1; - } + ip += envNameLen; + cp = _stpcpy ( cp, envVal ); } - ptr = ptr->next; } - } -} - + + if (*ip != _T('\0') && (_istcntrl (*ip))) + *ip = _T(' '); + *cp++ = *ip++; + } + *cp = _T('\0'); + + cmd_free(buffer); + cmd_free(tmp); + +} INT CommandAlias (LPTSTR cmd, LPTSTR param) { @@ -334,9 +195,9 @@ partstrlwr (param); if (ptr[0] == _T('\0')) - DeleteAlias (param); + AddConsoleAlias(param, NULL, _T("cmd.exe")); else - AddAlias (param, ptr); + AddConsoleAlias(param, ptr, _T("cmd.exe")); return 0; } 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 (original) +++ trunk/reactos/base/shell/cmd/cmd.c Sun Feb 3 00:06:53 2008 @@ -789,7 +789,6 @@ nRedirFlags |= ERROR_APPEND; _tcscpy(err, bc->Err); } - /* Set up the initial conditions ... */ /* preserve STDIN, STDOUT and STDERR handles */ @@ -1774,10 +1773,6 @@ InitLastPath (); #endif -#ifdef FATURE_ALIASES - InitializeAlias (); -#endif - if (argc >= 2) { for (i = 1; i < argc; i++) @@ -1898,10 +1893,6 @@ ParseCommandLine (_T("\\cmdexit.bat")); } -#ifdef FEATURE_ALIASES - DestroyAlias (); -#endif - #ifdef FEATURE_DIECTORY_STACK /* destroy directory stack */ DestroyDirectoryStack (); 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 (original) +++ trunk/reactos/base/shell/cmd/cmd.h Sun Feb 3 00:06:53 2008 @@ -67,11 +67,8 @@ /* Prototypes for ALIAS.C */ -VOID InitializeAlias (VOID); -VOID DestroyAlias (VOID); VOID ExpandAlias (LPTSTR, INT); INT CommandAlias (LPTSTR, LPTSTR); - /* Prototypes for ATTRIB.C */ INT CommandAttrib (LPTSTR, LPTSTR); @@ -130,6 +127,8 @@ VOID PrintCommandList (VOID); VOID PrintCommandListDetail (VOID); + +LPCTSTR GetParsedEnvVar ( LPCTSTR varName, UINT* varNameLen, BOOL ModeSetA ); /* Prototypes for COLOR.C */ VOID SetScreenColor(WORD wArgColor, BOOL bFill); Modified: trunk/reactos/dll/win32/kernel32/misc/console.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/dll/win32/kernel32/misc/co… ============================================================================== --- trunk/reactos/dll/win32/kernel32/misc/console.c (original) +++ trunk/reactos/dll/win32/kernel32/misc/console.c Sun Feb 3 00:06:53 2008 @@ -19,11 +19,22 @@ #define NDEBUG #include <debug.h> +typedef struct tagALIAS +{ + struct tagALIAS *next; + LPWSTR lpName; + LPWSTR lpSubst; + DWORD dwUsed; +} ALIAS, *LPALIAS; + +static LPALIAS lpFirst = NULL; +static LPALIAS lpLast = NULL; + extern BOOL WINAPI DefaultConsoleCtrlHandler(DWORD Event); extern __declspec(noreturn) VOID CALLBACK ConsoleControlDispatcher(DWORD CodeAndFlag); extern RTL_CRITICAL_SECTION ConsoleLock; extern BOOL WINAPI IsDebuggerPresent(VOID); - +static VOID partstrlwr (LPWSTR str); /* GLOBALS *******************************************************************/ @@ -32,6 +43,19 @@ static PHANDLER_ROUTINE* CtrlHandlers = NULL; static ULONG NrCtrlHandlers = 0; static WCHAR InputExeName[MAX_PATH + 1] = L""; + +/* module internal functions */ +/* strlwr only for first word in string */ +static VOID +partstrlwr (LPWSTR str) +{ + LPWSTR c = str; + while (*c && !iswspace (*c) && *c != L'=') + { + *c = towlower (*c); + c++; + } +} /* Default Console Control Handler *******************************************/ @@ -141,16 +165,36 @@ /* FUNCTIONS *****************************************************************/ /* - * @unimplemented + * @implemented */ BOOL STDCALL -AddConsoleAliasA (LPSTR Source, - LPSTR Target, - LPSTR ExeName) -{ - DPRINT1("AddConsoleAliasA(0x%x, 0x%x, 0x%x) UNIMPLEMENTED!\n", Source, Target, ExeName); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; +AddConsoleAliasA (LPCSTR lpSource, + LPCSTR lpTarget, + LPCSTR lpExeName) +{ + LPWSTR lpSourceW = NULL; + LPWSTR lpTargetW = NULL; + LPWSTR lpExeNameW = NULL; + BOOL bRetVal; + + if (lpSource) + BasepAnsiStringToHeapUnicodeString(lpSource, (LPWSTR*) &lpSourceW); + if (lpTarget) + BasepAnsiStringToHeapUnicodeString(lpTarget, (LPWSTR*) &lpTargetW); + if (lpExeName) + BasepAnsiStringToHeapUnicodeString(lpExeName, (LPWSTR*) &lpExeNameW); + + bRetVal = AddConsoleAliasW(lpSourceW, lpTargetW, lpExeNameW); + + /* Clean up */ + if (lpSourceW) + RtlFreeHeap(GetProcessHeap(), 0, (LPWSTR*) lpSourceW); + if (lpTargetW) + RtlFreeHeap(GetProcessHeap(), 0, (LPWSTR*) lpTargetW); + if (lpExeNameW) + RtlFreeHeap(GetProcessHeap(), 0, (LPWSTR*) lpExeNameW); + + return bRetVal; } @@ -158,13 +202,129 @@ * @unimplemented */ BOOL STDCALL -AddConsoleAliasW (LPWSTR Source, - LPWSTR Target, - LPWSTR ExeName) -{ - DPRINT1("AddConsoleAliasW(0x%x, 0x%x, 0x%x) UNIMPLEMENTED!\n", Source, Target, ExeName); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return FALSE; +AddConsoleAliasW (LPCWSTR lpSource, + LPCWSTR lpTarget, + LPCWSTR lpExeName /* FIXME: currently ignored */) +{ + LPALIAS ptr = lpFirst; + LPALIAS prev = NULL; + LPALIAS entry = NULL; + LPWSTR s; + + if (!lpTarget) + { + /* delete */ + while (ptr) + { + if (!wcsicmp (ptr->lpName, lpSource)) + { + if (prev) + prev->next = ptr->next; + else + lpFirst = ptr->next; + RtlFreeHeap (GetProcessHeap(), 0, ptr->lpName); + RtlFreeHeap (GetProcessHeap(), 0, ptr->lpSubst); + RtlFreeHeap (GetProcessHeap(), 0, ptr); + return TRUE; + } + prev = ptr; + ptr = ptr->next; + } + } + else + { + /* add */ + while (ptr) + { + if (!wcsicmp (ptr->lpName, lpSource)) + { + s = (LPWSTR) RtlAllocateHeap (GetProcessHeap(), 0, ((wcslen (lpTarget) + 1) * sizeof(WCHAR))); + if (!s) + { + return FALSE; + } + + RtlFreeHeap (GetProcessHeap(), 0, ptr->lpSubst); + ptr->lpSubst = s; + wcscpy (ptr->lpSubst, lpTarget); + return TRUE; + } + ptr = ptr->next; + } + + ptr = (LPALIAS) RtlAllocateHeap (GetProcessHeap(), 0, sizeof(ALIAS)); + if (!ptr) + return FALSE; + + ptr->next = 0; + + ptr->lpName = (LPWSTR) RtlAllocateHeap (GetProcessHeap(), 0, ((wcslen (lpSource) + 1) * sizeof(WCHAR))); + if (!ptr->lpName) + { + RtlFreeHeap (GetProcessHeap(), 0, ptr); + return FALSE; + } + wcscpy (ptr->lpName, lpSource); + + ptr->lpSubst = (LPWSTR) RtlAllocateHeap (GetProcessHeap(), 0, ((wcslen (lpTarget) + 1) * sizeof(WCHAR))); + if (!ptr->lpSubst) + { + RtlFreeHeap (GetProcessHeap(), 0, ptr->lpName); + RtlFreeHeap (GetProcessHeap(), 0, ptr); + return FALSE; + } + wcscpy (ptr->lpSubst, lpTarget); + + /* it's necessary for recursive substitution */ + partstrlwr (ptr->lpSubst); + + ptr->dwUsed = 0; + + /* Alias table must be sorted! + * Here a little example: + * command line = "ls -c" + * If the entries are + * ls=dir + * ls -c=ls /w + * command line will be expanded to "dir -c" which is not correct. + * If the entries are sortet as + * ls -c=ls /w + * ls=dir + * it will be expanded to "dir /w" which is a valid DOS command. + */ + entry = lpFirst; + prev = 0; + while (entry) + { + if (wcsicmp (ptr->lpName, entry->lpName) > 0) + + { + if (prev) + { + prev->next = ptr; + ptr->next = entry; + } + else + { + ptr->next = entry; + lpFirst = ptr; + } + return TRUE; + } + prev = entry; + entry = entry->next; + } + + /* The new entry is the smallest (or the first) and must be + * added to the end of the list. + */ + if (!lpFirst) + lpFirst = ptr; + else + lpLast->next = ptr; + lpLast = ptr; + } + return TRUE; } @@ -252,20 +412,39 @@ /* - * @unimplemented + * @implemented */ DWORD STDCALL GetConsoleAliasW (LPWSTR lpSource, LPWSTR lpTargetBuffer, DWORD TargetBufferLength, - LPWSTR lpExeName) - /* - * Undocumented - */ -{ - DPRINT1("GetConsoleAliasW(0x%p, 0x%p, 0x%x, 0x%p) UNIMPLEMENTED!\n", lpSource, lpTargetBuffer, TargetBufferLength, lpExeName); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; + LPWSTR lpExeName) /* FIXME: currently ignored */ +{ + DWORD dwRet = 0; + + if (!lpTargetBuffer) + return 0; + + LPALIAS ptr = lpFirst; + while (ptr) + { + if (wcscmp(ptr->lpName, lpSource) == 0) + { + if (TargetBufferLength >= wcslen(ptr->lpSubst) +1) + { + wcscpy(lpTargetBuffer, ptr->lpSubst); + dwRet = wcslen(ptr->lpSubst); + break; + } + else + { + return 0; + } + } + ptr = ptr->next; + } + + return dwRet; } @@ -277,9 +456,6 @@ LPSTR lpTargetBuffer, DWORD TargetBufferLength, LPSTR lpExeName) - /* - * Undocumented - */ { DPRINT1("GetConsoleAliasA(0x%p, 0x%p, 0x%x, 0x%p) UNIMPLEMENTED!\n", lpSource, lpTargetBuffer, TargetBufferLength, lpExeName); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); @@ -293,9 +469,6 @@ DWORD STDCALL GetConsoleAliasExesW (LPWSTR lpExeNameBuffer, DWORD ExeNameBufferLength) - /* - * Undocumented - */ { DPRINT1("GetConsoleAliasExesW(0x%p, 0x%x) UNIMPLEMENTED!\n", lpExeNameBuffer, ExeNameBufferLength); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); @@ -309,9 +482,6 @@ DWORD STDCALL GetConsoleAliasExesA (LPSTR lpExeNameBuffer, DWORD ExeNameBufferLength) - /* - * Undocumented - */ { DPRINT1("GetConsoleAliasExesA(0x%p, 0x%x) UNIMPLEMENTED!\n", lpExeNameBuffer, ExeNameBufferLength); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); @@ -324,9 +494,6 @@ */ DWORD STDCALL GetConsoleAliasExesLengthA (VOID) - /* - * Undocumented - */ { DPRINT1("GetConsoleAliasExesLengthA() UNIMPLEMENTED!\n"); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); @@ -339,9 +506,6 @@ */ DWORD STDCALL GetConsoleAliasExesLengthW (VOID) - /* - * Undocumented - */ { DPRINT1("GetConsoleAliasExesLengthW() UNIMPLEMENTED!\n"); SetLastError(ERROR_CALL_NOT_IMPLEMENTED); @@ -350,19 +514,35 @@ /* - * @unimplemented + * @implemented */ DWORD STDCALL GetConsoleAliasesW (LPWSTR AliasBuffer, DWORD AliasBufferLength, - LPWSTR ExeName) - /* - * Undocumented - */ -{ - DPRINT1("GetConsoleAliasesW(0x%p, 0x%x, 0x%p) UNIMPLEMENTED!\n", AliasBuffer, AliasBufferLength, ExeName); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; + LPWSTR ExeName) /* FIXME: currently ignored */ +{ + DWORD len; + WCHAR Buffer[MAX_PATH]; + LPWSTR AliasPtr; + + if (!AliasBuffer) + return 0; + + AliasPtr = AliasBuffer; + len = GetConsoleAliasesLengthW (ExeName); + if (len > AliasBufferLength) + return 0; + + LPALIAS ptr = lpFirst; + while (ptr) + { + swprintf(Buffer, L"%s=%s" , ptr->lpName, ptr->lpSubst); + wcscpy(AliasBuffer, Buffer); + AliasBuffer += wcslen(Buffer) + 1; + ptr = ptr->next; + } + + return (INT) (AliasBuffer - AliasPtr); } @@ -384,32 +564,43 @@ /* - * @unimplemented + * @implemented */ DWORD STDCALL -GetConsoleAliasesLengthW (LPWSTR lpExeName) - /* - * Undocumented - */ -{ - DPRINT1("GetConsoleAliasesLengthW(0x%p) UNIMPLEMENTED!\n", lpExeName); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; -} - - -/* - * @unimplemented +GetConsoleAliasesLengthW (LPWSTR lpExeName /* FIXME: currently ignored */) +{ + DWORD len = 0; + LPALIAS ptr = lpFirst; + while (ptr) + { + len += wcslen(ptr->lpName) * sizeof(WCHAR); + len += wcslen(ptr->lpSubst) * sizeof(WCHAR); + len += 2 * sizeof(WCHAR); /* '=' + '\0' */ + ptr = ptr->next; + } + return len; +} + + +/* + * @implemented */ DWORD STDCALL GetConsoleAliasesLengthA (LPSTR lpExeName) - /* - * Undocumented - */ -{ - DPRINT1("GetConsoleAliasesLengthA(0x%p) UNIMPLEMENTED!\n", lpExeName); - SetLastError(ERROR_CALL_NOT_IMPLEMENTED); - return 0; +{ + DWORD dwRetVal = 0; + LPWSTR lpExeNameW = NULL; + + if (lpExeName) + BasepAnsiStringToHeapUnicodeString(lpExeName, (LPWSTR*) &lpExeNameW); + + dwRetVal = (GetConsoleAliasesLengthW(lpExeNameW) / sizeof(WCHAR)); + + /* Clean up */ + if (lpExeNameW) + RtlFreeHeap(GetProcessHeap(), 0, (LPWSTR*) lpExeNameW); + + return dwRetVal; } Modified: trunk/reactos/include/psdk/wincon.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/include/psdk/wincon.h?rev=… ============================================================================== --- trunk/reactos/include/psdk/wincon.h (original) +++ trunk/reactos/include/psdk/wincon.h Sun Feb 3 00:06:53 2008 @@ -167,6 +167,14 @@ #if (_WIN32_WINNT >= 0x0501) #define ATTACH_PARENT_PROCESS (DWORD)-1 BOOL WINAPI AttachConsole(DWORD); +BOOL WINAPI AddConsoleAliasA(LPCSTR,LPCSTR,LPCSTR); +BOOL WINAPI AddConsoleAliasW(LPCWSTR,LPCWSTR,LPCWSTR); +DWORD WINAPI GetConsoleAliasA(LPSTR,LPSTR,DWORD,LPSTR); +DWORD WINAPI GetConsoleAliasW(LPWSTR,LPWSTR,DWORD,LPWSTR); +DWORD WINAPI GetConsoleAliasesA(LPSTR,DWORD,LPSTR); +DWORD WINAPI GetConsoleAliasesW(LPWSTR,DWORD,LPWSTR); +DWORD WINAPI GetConsoleAliasesLengthA(LPSTR); +DWORD WINAPI GetConsoleAliasesLengthW(LPWSTR); #endif HANDLE WINAPI CreateConsoleScreenBuffer(DWORD,DWORD,CONST SECURITY_ATTRIBUTES*,DWORD,LPVOID); BOOL WINAPI FillConsoleOutputAttribute(HANDLE,WORD,DWORD,COORD,PDWORD); @@ -225,6 +233,10 @@ #ifdef UNICODE #define FillConsoleOutputCharacter FillConsoleOutputCharacterW +#define AddConsoleAlias AddConsoleAliasW +#define GetConsoleAlias GetConsoleAliasW +#define GetConsoleAliases GetConsoleAliasesW +#define GetConsoleAliasesLength GetConsoleAliasesLengthW #define GetConsoleTitle GetConsoleTitleW #define PeekConsoleInput PeekConsoleInputW #define ReadConsole ReadConsoleW @@ -238,7 +250,11 @@ #define WriteConsoleOutput WriteConsoleOutputW #define WriteConsoleOutputCharacter WriteConsoleOutputCharacterW #else +#define AddConsoleAlias AddConsoleAliasA #define FillConsoleOutputCharacter FillConsoleOutputCharacterA +#define GetConsoleAlias GetConsoleAliasA +#define GetConsoleAliases GetConsoleAliasesA +#define GetConsoleAliasesLength GetConsoleAliasesLengthA #define GetConsoleTitle GetConsoleTitleA #define PeekConsoleInput PeekConsoleInputA #define ReadConsole ReadConsoleA

1 0

[cfinck] 32092: - Fix funky ways of checking for success, when calling SetFilePointer. The only correct and always working way is checking for INVALID_SET_FILE_POINTER. - Fix setting the file attributes. We didn't pass the destination directory before, so if the user specified another destination directory, the SetFileAttributes call failed. - Simplify GetAttributesOnFile and SetAttributesOnFile
by cfinck＠svn.reactos.org 02 Feb '08

02 Feb '08

Author: cfinck Date: Sat Feb 2 22:21:35 2008 New Revision: 32092 URL: http://svn.reactos.org/svn/reactos?rev=32092&view=rev Log: - Fix funky ways of checking for success, when calling SetFilePointer. The only correct and always working way is checking for INVALID_SET_FILE_POINTER. - Fix setting the file attributes. We didn't pass the destination directory before, so if the user specified another destination directory, the SetFileAttributes call failed. - Simplify GetAttributesOnFile and SetAttributesOnFile Modified: trunk/reactos/tools/cabman/cabinet.cxx trunk/reactos/tools/cabman/cabinet.h Modified: trunk/reactos/tools/cabman/cabinet.cxx URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/cabman/cabinet.cxx?r… ============================================================================== --- trunk/reactos/tools/cabman/cabinet.cxx (original) +++ trunk/reactos/tools/cabman/cabinet.cxx Sat Feb 2 22:21:35 2008 @@ -189,7 +189,7 @@ */ { #if defined(WIN32) - if (!SetFilePointer(FileHandle, 0, NULL, FILE_BEGIN)) + if( SetFilePointer(FileHandle, 0, NULL, FILE_BEGIN) == INVALID_SET_FILE_POINTER ) return CAB_STATUS_FAILURE; if (!SetEndOfFile(FileHandle)) return CAB_STATUS_FAILURE; @@ -231,10 +231,10 @@ */ { #if defined(WIN32) - if (SetFilePointer(FileHandle, - Position, - NULL, - FILE_BEGIN) == 0xFFFFFFFF) + if( SetFilePointer(FileHandle, + Position, + NULL, + FILE_BEGIN) == INVALID_SET_FILE_POINTER ) return CAB_STATUS_FAILURE; else return CAB_STATUS_SUCCESS; @@ -712,10 +712,9 @@ DataReserved = (Size >> 24) & 0xFF; #if defined(WIN32) - SetFilePointer(FileHandle, CabinetReserved, NULL, FILE_CURRENT); - if (GetLastError() != NO_ERROR) + if (SetFilePointer(FileHandle, CabinetReserved, NULL, FILE_CURRENT) == INVALID_SET_FILE_POINTER) { - DPRINT(MIN_TRACE, ("SetFilePointer() failed.\n")); + DPRINT(MIN_TRACE, ("SetFilePointer() failed, error code is %u.\n", GetLastError())); return CAB_STATUS_FAILURE; } #else @@ -823,7 +822,7 @@ ULONG CCabinet::FindFirst(char* FileName, - PCAB_SEARCH Search) + PCAB_SEARCH Search) /* * FUNCTION: Finds the first file in the cabinet that matches a search criteria * ARGUMENTS: @@ -1030,7 +1029,7 @@ #else //DPRINT(MIN_TRACE, ("FIXME: DosDateTimeToFileTime\n")); #endif - SetAttributesOnFile(File); + SetAttributesOnFile(DestName, File->File.Attributes); Buffer = (unsigned char*)AllocateMemory(CAB_BLOCKSIZE + 12); // This should be enough if (!Buffer) @@ -1049,9 +1048,9 @@ File->DataBlock->AbsoluteOffset, NULL, FILE_BEGIN); - if (GetLastError() != NO_ERROR) - { - DPRINT(MIN_TRACE, ("SetFilePointer() failed.\n")); + if (Offset == INVALID_SET_FILE_POINTER) + { + DPRINT(MIN_TRACE, ("SetFilePointer() failed, error code is %u.\n", GetLastError())); return CAB_STATUS_INVALID_CAB; } #else @@ -1171,13 +1170,12 @@ /* Search to start of file */ #if defined(WIN32) - SetFilePointer(FileHandle, - File->DataBlock->AbsoluteOffset, - NULL, - FILE_BEGIN); - if (GetLastError() != NO_ERROR) + if( SetFilePointer(FileHandle, + File->DataBlock->AbsoluteOffset, + NULL, + FILE_BEGIN) == INVALID_SET_FILE_POINTER ) { - DPRINT(MIN_TRACE, ("SetFilePointer() failed.\n")); + DPRINT(MIN_TRACE, ("SetFilePointer() failed, error code is %u.\n", GetLastError())); return CAB_STATUS_INVALID_CAB; } #else @@ -1247,14 +1245,13 @@ /* Go to next data block */ #if defined(WIN32) - SetFilePointer(FileHandle, - CurrentDataNode->AbsoluteOffset + sizeof(CFDATA) + - CurrentDataNode->Data.CompSize, - NULL, - FILE_BEGIN); - if (GetLastError() != NO_ERROR) + if( SetFilePointer(FileHandle, + CurrentDataNode->AbsoluteOffset + sizeof(CFDATA) + + CurrentDataNode->Data.CompSize, + NULL, + FILE_BEGIN) == INVALID_SET_FILE_POINTER ) { - DPRINT(MIN_TRACE, ("SetFilePointer() failed.\n")); + DPRINT(MIN_TRACE, ("SetFilePointer() failed, error code is %u.\n", GetLastError())); return CAB_STATUS_INVALID_CAB; } #else @@ -2231,14 +2228,12 @@ /* Back up some bytes */ Size = (BytesRead - Size) - 1; #if defined(WIN32) - SetLastError(NO_ERROR); - (ULONG)SetFilePointer(FileHandle, - -(LONG)Size, - NULL, - FILE_CURRENT); - if (GetLastError() != NO_ERROR) - { - DPRINT(MIN_TRACE, ("SetFilePointer() failed.\n")); + if( SetFilePointer(FileHandle, + -(LONG)Size, + NULL, + FILE_CURRENT) == INVALID_SET_FILE_POINTER ) + { + DPRINT(MIN_TRACE, ("SetFilePointer() failed, error code is %u.\n", GetLastError())); return CAB_STATUS_INVALID_CAB; } #else @@ -2269,15 +2264,12 @@ /* Seek to file table */ #if defined(WIN32) - SetLastError(NO_ERROR); - SetFilePointer(FileHandle, - CABHeader.FileTableOffset, - NULL, - FILE_BEGIN); - if (GetLastError() != NO_ERROR) - { - DPRINT(MIN_TRACE, ("SetFilePointer() failed.\n")); - DPRINT(MIN_TRACE, ("Error: %lu\n", GetLastError())); + if( SetFilePointer(FileHandle, + CABHeader.FileTableOffset, + NULL, + FILE_BEGIN) == INVALID_SET_FILE_POINTER ) + { + DPRINT(MIN_TRACE, ("SetFilePointer() failed, error code is %u.\n", GetLastError())); return CAB_STATUS_INVALID_CAB; } #else @@ -2360,14 +2352,12 @@ /* Seek to data block */ #if defined(WIN32) - SetLastError(NO_ERROR); - SetFilePointer(FileHandle, - AbsoluteOffset, - NULL, - FILE_BEGIN); - if (GetLastError() != NO_ERROR) - { - DPRINT(MIN_TRACE, ("SetFilePointer() failed.\n")); + if( SetFilePointer(FileHandle, + AbsoluteOffset, + NULL, + FILE_BEGIN) == INVALID_SET_FILE_POINTER ) + { + DPRINT(MIN_TRACE, ("SetFilePointer() failed, error code is %u.\n", GetLastError())); return CAB_STATUS_INVALID_CAB; } #else @@ -3384,20 +3374,10 @@ if (Attributes == -1) return CAB_STATUS_CANNOT_READ; - if (Attributes & FILE_ATTRIBUTE_READONLY) - File->File.Attributes |= CAB_ATTRIB_READONLY; - - if (Attributes & FILE_ATTRIBUTE_HIDDEN) - File->File.Attributes |= CAB_ATTRIB_HIDDEN; - - if (Attributes & FILE_ATTRIBUTE_SYSTEM) - File->File.Attributes |= CAB_ATTRIB_SYSTEM; - - if (Attributes & FILE_ATTRIBUTE_DIRECTORY) - File->File.Attributes |= CAB_ATTRIB_DIRECTORY; - - if (Attributes & FILE_ATTRIBUTE_ARCHIVE) - File->File.Attributes |= CAB_ATTRIB_ARCHIVE; + // 0x37 = READONLY | HIDDEN | SYSTEM | DIRECTORY | ARCHIVE + // The IDs for these attributes are the same in the CAB file and under Windows + // If the file has any other attributes, strip them off by the logical AND. + File->File.Attributes = (USHORT)(Attributes & 0x37); #else struct stat stbuf; char buf[MAX_PATH]; @@ -3431,34 +3411,21 @@ } -ULONG CCabinet::SetAttributesOnFile(PCFFILE_NODE File) +ULONG CCabinet::SetAttributesOnFile(char* FileName, USHORT FileAttributes) /* * FUNCTION: Sets attributes on a file * ARGUMENTS: - * File = Pointer to CFFILE node for file + * FileName = File name with path + * FileAttributes = Attributes of that file * RETURNS: * Status of operation */ { #if defined(WIN32) - ULONG Attributes = 0; - - if (File->File.Attributes & CAB_ATTRIB_READONLY) - Attributes |= FILE_ATTRIBUTE_READONLY; - - if (File->File.Attributes & CAB_ATTRIB_HIDDEN) - Attributes |= FILE_ATTRIBUTE_HIDDEN; - - if (File->File.Attributes & CAB_ATTRIB_SYSTEM) - Attributes |= FILE_ATTRIBUTE_SYSTEM; - - if (File->File.Attributes & CAB_ATTRIB_DIRECTORY) - Attributes |= FILE_ATTRIBUTE_DIRECTORY; - - if (File->File.Attributes & CAB_ATTRIB_ARCHIVE) - Attributes |= FILE_ATTRIBUTE_ARCHIVE; - - SetFileAttributes(File->FileName, Attributes); + // 0x37 = READONLY | HIDDEN | SYSTEM | DIRECTORY | ARCHIVE + // The IDs for these attributes are the same in the CAB file and under Windows + // If the file has any other attributes, strip them off by the logical AND. + SetFileAttributes(FileName, (DWORD)(FileAttributes & 0x37)); return CAB_STATUS_SUCCESS; #else Modified: trunk/reactos/tools/cabman/cabinet.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/cabman/cabinet.h?rev… ============================================================================== --- trunk/reactos/tools/cabman/cabinet.h (original) +++ trunk/reactos/tools/cabman/cabinet.h Sat Feb 2 22:21:35 2008 @@ -416,7 +416,7 @@ ULONG CommitDataBlocks(PCFFOLDER_NODE FolderNode); ULONG WriteDataBlock(); ULONG GetAttributesOnFile(PCFFILE_NODE File); - ULONG SetAttributesOnFile(PCFFILE_NODE File); + ULONG SetAttributesOnFile(char* FileName, USHORT FileAttributes); ULONG GetFileTimes(FILEHANDLE FileHandle, PCFFILE_NODE File); #if !defined(WIN32) void ConvertDateAndTime(time_t* Time, PUSHORT DosDate, PUSHORT DosTime);

1 0

[dreimer] 32091: small cosmetic fix
by dreimer＠svn.reactos.org 02 Feb '08

02 Feb '08

Author: dreimer Date: Sat Feb 2 18:26:20 2008 New Revision: 32091 URL: http://svn.reactos.org/svn/reactos?rev=32091&view=rev Log: small cosmetic fix Modified: trunk/tools/RosBE/RosBE-Windows/Root/Build.cmd trunk/tools/RosBE/RosBE-Windows/Root/Clean.cmd trunk/tools/RosBE/RosBE-Windows/Root/Config.cmd trunk/tools/RosBE/RosBE-Windows/Root/Help.cmd trunk/tools/RosBE/RosBE-Windows/Root/MinGW.cmd trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd trunk/tools/RosBE/RosBE-Windows/Root/TimeDate.cmd trunk/tools/RosBE/RosBE-Windows/Root/chdefdir.cmd trunk/tools/RosBE/RosBE-Windows/Root/chdefgcc.cmd trunk/tools/RosBE/RosBE-Windows/Root/options.cmd trunk/tools/RosBE/RosBE-Windows/Root/reladdr2line.cmd trunk/tools/RosBE/RosBE-Windows/Root/rosbe-gcc-env.cmd trunk/tools/RosBE/RosBE-Windows/Root/sSVN.cmd trunk/tools/RosBE/RosBE-Windows/Root/scut.cmd Modified: trunk/tools/RosBE/RosBE-Windows/Root/Build.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Bui… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/Build.cmd (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/Build.cmd Sat Feb 2 18:26:20 2008 @@ -8,10 +8,10 @@ :: Peter Ward <dralnix(a)gmail.com> :: :: - +@echo off if not defined _ROSBE_DEBUG set _ROSBE_DEBUG=0 -if %_ROSBE_DEBUG% == 0 ( - @echo off +if %_ROSBE_DEBUG% == 1 ( + @echo on ) :: Modified: trunk/tools/RosBE/RosBE-Windows/Root/Clean.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Cle… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/Clean.cmd (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/Clean.cmd Sat Feb 2 18:26:20 2008 @@ -7,10 +7,10 @@ :: Peter Ward <dralnix(a)gmail.com> :: :: - +@echo off if not defined _ROSBE_DEBUG set _ROSBE_DEBUG=0 -if %_ROSBE_DEBUG% == 0 ( - @echo off +if %_ROSBE_DEBUG% == 1 ( + @echo on ) title Cleaning... Modified: trunk/tools/RosBE/RosBE-Windows/Root/Config.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Con… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/Config.cmd (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/Config.cmd Sat Feb 2 18:26:20 2008 @@ -6,10 +6,10 @@ :: COPYRIGHT: Copyright 2007 Daniel Reimer <reimer.daniel(a)freenet.de> :: :: - +@echo off if not defined _ROSBE_DEBUG set _ROSBE_DEBUG=0 -if %_ROSBE_DEBUG% == 0 ( - @echo off +if %_ROSBE_DEBUG% == 1 ( + @echo on ) title ReactOS Build Configurator Modified: trunk/tools/RosBE/RosBE-Windows/Root/Help.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Hel… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/Help.cmd (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/Help.cmd Sat Feb 2 18:26:20 2008 @@ -7,10 +7,10 @@ :: Peter Ward <dralnix(a)gmail.com> :: :: - +@echo off if not defined _ROSBE_DEBUG set _ROSBE_DEBUG=0 -if %_ROSBE_DEBUG% == 0 ( - @echo off +if %_ROSBE_DEBUG% == 1 ( + @echo on ) :: Modified: trunk/tools/RosBE/RosBE-Windows/Root/MinGW.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Min… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/MinGW.cmd (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/MinGW.cmd Sat Feb 2 18:26:20 2008 @@ -7,10 +7,10 @@ :: Peter Ward <dralnix(a)gmail.com> :: :: - +@echo off if not defined _ROSBE_DEBUG set _ROSBE_DEBUG=0 -if %_ROSBE_DEBUG% == 0 ( - @echo off +if %_ROSBE_DEBUG% == 1 ( + @echo on ) if not "%1" == "" ( Modified: trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Ros… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd Sat Feb 2 18:26:20 2008 @@ -8,10 +8,10 @@ :: Peter Ward <dralnix(a)gmail.com> :: :: - +@echo off if not defined _ROSBE_DEBUG set _ROSBE_DEBUG=0 -if %_ROSBE_DEBUG% == 0 ( - @echo off +if %_ROSBE_DEBUG% == 1 ( + @echo on ) :: Modified: trunk/tools/RosBE/RosBE-Windows/Root/TimeDate.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Tim… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/TimeDate.cmd (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/TimeDate.cmd Sat Feb 2 18:26:20 2008 @@ -7,10 +7,10 @@ :: Peter Ward <dralnix(a)gmail.com> :: :: - +@echo off if not defined _ROSBE_DEBUG set _ROSBE_DEBUG=0 -if %_ROSBE_DEBUG% == 0 ( - @echo off +if %_ROSBE_DEBUG% == 1 ( + @echo on ) :: Modified: trunk/tools/RosBE/RosBE-Windows/Root/chdefdir.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/chd… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/chdefdir.cmd (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/chdefdir.cmd Sat Feb 2 18:26:20 2008 @@ -8,10 +8,10 @@ :: Peter Ward <dralnix(a)gmail.com> :: :: - +@echo off if not defined _ROSBE_DEBUG set _ROSBE_DEBUG=0 -if %_ROSBE_DEBUG% == 0 ( - @echo off +if %_ROSBE_DEBUG% == 1 ( + @echo on ) title Change the current working ReactOS source directory... Modified: trunk/tools/RosBE/RosBE-Windows/Root/chdefgcc.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/chd… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/chdefgcc.cmd (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/chdefgcc.cmd Sat Feb 2 18:26:20 2008 @@ -6,10 +6,10 @@ :: COPYRIGHT: Copyright 2007 Daniel Reimer <reimer.daniel(a)freenet.de> :: Peter Ward <dralnix(a)gmail.com> :: - +@echo off if not defined _ROSBE_DEBUG set _ROSBE_DEBUG=0 -if %_ROSBE_DEBUG% == 0 ( - @echo off +if %_ROSBE_DEBUG% == 1 ( + @echo on ) if "%_ROSBE_MODE%" == "RosBE" ( Modified: trunk/tools/RosBE/RosBE-Windows/Root/options.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/opt… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/options.cmd (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/options.cmd Sat Feb 2 18:26:20 2008 @@ -6,10 +6,10 @@ :: COPYRIGHT: Copyright 2007 Daniel Reimer <reimer.daniel(a)freenet.de> :: :: - +@echo off if not defined _ROSBE_DEBUG set _ROSBE_DEBUG=0 -if %_ROSBE_DEBUG% == 0 ( - @echo off +if %_ROSBE_DEBUG% == 1 ( + @echo on ) title Options Modified: trunk/tools/RosBE/RosBE-Windows/Root/reladdr2line.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/rel… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/reladdr2line.cmd (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/reladdr2line.cmd Sat Feb 2 18:26:20 2008 @@ -8,10 +8,10 @@ :: Peter Ward <dralnix(a)gmail.com> :: :: - +@echo off if not defined _ROSBE_DEBUG set _ROSBE_DEBUG=0 -if %_ROSBE_DEBUG% == 0 ( - @echo off +if %_ROSBE_DEBUG% == 1 ( + @echo on ) title reladdr2line... Modified: trunk/tools/RosBE/RosBE-Windows/Root/rosbe-gcc-env.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/ros… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/rosbe-gcc-env.cmd (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/rosbe-gcc-env.cmd Sat Feb 2 18:26:20 2008 @@ -7,10 +7,10 @@ :: Peter Ward <dralnix(a)gmail.com> :: :: - +@echo off if not defined _ROSBE_DEBUG set _ROSBE_DEBUG=0 -if %_ROSBE_DEBUG% == 0 ( - @echo off +if %_ROSBE_DEBUG% == 1 ( + @echo on ) :: Modified: trunk/tools/RosBE/RosBE-Windows/Root/sSVN.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/sSV… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/sSVN.cmd (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/sSVN.cmd Sat Feb 2 18:26:20 2008 @@ -6,10 +6,10 @@ :: COPYRIGHT: Copyright 2007 Daniel Reimer <reimer.daniel(a)freenet.de> :: :: - +@echo off if not defined _ROSBE_DEBUG set _ROSBE_DEBUG=0 -if %_ROSBE_DEBUG% == 0 ( - @echo off +if %_ROSBE_DEBUG% == 1 ( + @echo on ) :: Modified: trunk/tools/RosBE/RosBE-Windows/Root/scut.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/scu… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/scut.cmd (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/scut.cmd Sat Feb 2 18:26:20 2008 @@ -7,10 +7,10 @@ :: Daniel Reimer <reimer.daniel(a)freenet.de> :: Peter Ward <dralnix(a)gmail.com> :: - +@echo off if not defined _ROSBE_DEBUG set _ROSBE_DEBUG=0 -if %_ROSBE_DEBUG% == 0 ( - @echo off +if %_ROSBE_DEBUG% == 1 ( + @echo on ) :: Check if the parameter is an scut parameter, which can just be forwarded to the EXE file

1 0

[fireball] 32090: - Mark APIC's memory as WriteThrough / CacheDisabled.
by fireball＠svn.reactos.org 02 Feb '08

02 Feb '08

Author: fireball Date: Sat Feb 2 18:15:41 2008 New Revision: 32090 URL: http://svn.reactos.org/svn/reactos?rev=32090&view=rev Log: - Mark APIC's memory as WriteThrough / CacheDisabled. Modified: trunk/reactos/boot/freeldr/freeldr/windows/wlmemory.c Modified: trunk/reactos/boot/freeldr/freeldr/windows/wlmemory.c URL: http://svn.reactos.org/svn/reactos/trunk/reactos/boot/freeldr/freeldr/windo… ============================================================================== --- trunk/reactos/boot/freeldr/freeldr/windows/wlmemory.c (original) +++ trunk/reactos/boot/freeldr/freeldr/windows/wlmemory.c Sat Feb 2 18:15:41 2008 @@ -436,6 +436,8 @@ = APICAddress >> MM_PAGE_SHIFT; HalPageTable[(APIC_BASE - 0xFFC00000) >> MM_PAGE_SHIFT].Valid = 1; HalPageTable[(APIC_BASE - 0xFFC00000) >> MM_PAGE_SHIFT].Write = 1; + HalPageTable[(APIC_BASE - 0xFFC00000) >> MM_PAGE_SHIFT].WriteThrough = 1; + HalPageTable[(APIC_BASE - 0xFFC00000) >> MM_PAGE_SHIFT].CacheDisable = 1; } #else VOID @@ -547,7 +549,7 @@ // TEMP, DEBUG! // adding special reserved memory zones for vmware workstation -#if 0 +#if 1 { Mad[MadCount].BasePage = 0xfec00; Mad[MadCount].PageCount = 0x10;

1 0

[cfinck] 32089: - Add an -M option to specify, which compression codec shall be used (either "raw" or "mszip") - Enable the RAW codec in the SelectCodec() function - Don't initialize a codec in the CCabinet constructor, this will be done by the ParseCmdline() function - Fix parsing the -L and -P parameters, when there's no whitespace between the parameter and the value - Remove some unneeded casts - Remove the cabman vesion number, it was never updated, although there were many changes since the
by cfinck＠svn.reactos.org 02 Feb '08

02 Feb '08

Author: cfinck Date: Sat Feb 2 17:32:44 2008 New Revision: 32089 URL: http://svn.reactos.org/svn/reactos?rev=32089&view=rev Log: - Add an -M option to specify, which compression codec shall be used (either "raw" or "mszip") - Enable the RAW codec in the SelectCodec() function - Don't initialize a codec in the CCabinet constructor, this will be done by the ParseCmdline() function - Fix parsing the -L and -P parameters, when there's no whitespace between the parameter and the value - Remove some unneeded casts - Remove the cabman vesion number, it was never updated, although there were many changes since the first version Modified: trunk/reactos/tools/cabman/cabinet.cxx trunk/reactos/tools/cabman/cabinet.h trunk/reactos/tools/cabman/dfp.cxx trunk/reactos/tools/cabman/main.cxx Modified: trunk/reactos/tools/cabman/cabinet.cxx URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/cabman/cabinet.cxx?r… ============================================================================== --- trunk/reactos/tools/cabman/cabinet.cxx (original) +++ trunk/reactos/tools/cabman/cabinet.cxx Sat Feb 2 17:32:44 2008 @@ -320,9 +320,9 @@ FileListHead = NULL; FileListTail = NULL; - Codec = new CRawCodec(); - CodecId = CAB_CODEC_RAW; - CodecSelected = true; + Codec = NULL; + CodecId = -1; + CodecSelected = false; OutputBuffer = NULL; InputBuffer = NULL; @@ -359,7 +359,7 @@ * ARGUMENTS: * Char = Character to check * RETURNS: - * Wether it is a separator + * Whether it is a separator */ { if ((Char == '\\') || (Char == '/')) @@ -511,6 +511,25 @@ NormalizePath(DestPath, MAX_PATH); } +bool CCabinet::SetCompressionCodec(char* CodecName) +/* + * FUNCTION: Selects the codec to use for compression + * ARGUMENTS: + * CodecName = Pointer to a string with the name of the codec + */ +{ + if( !strcasecmp(CodecName, "raw") ) + SelectCodec(CAB_CODEC_RAW); + else if( !strcasecmp(CodecName, "mszip") ) + SelectCodec(CAB_CODEC_MSZIP); + else + { + printf("Invalid codec specified!\n"); + return false; + } + + return true; +} char* CCabinet::GetDestinationPath() /* @@ -1300,8 +1319,17 @@ return CAB_STATUS_SUCCESS; } - -void CCabinet::SelectCodec(ULONG Id) +bool CCabinet::IsCodecSelected() +/* + * FUNCTION: Returns the value of CodecSelected + * RETURNS: + * Whether a codec is selected + */ +{ + return CodecSelected; +} + +void CCabinet::SelectCodec(LONG Id) /* * FUNCTION: Selects codec engine to use * ARGUMENTS: @@ -1320,9 +1348,7 @@ switch (Id) { case CAB_CODEC_RAW: -#if 0 Codec = new CRawCodec(); -#endif break; case CAB_CODEC_MSZIP: @@ -2080,7 +2106,7 @@ PCFDATA_NODE Node; DPRINT(MAX_TRACE, ("FileName '%s' FileOffset (0x%lX) FileSize (%lu).\n", - (char*)File->FileName, + File->FileName, (ULONG)File->File.FileOffset, (ULONG)File->File.FileSize)); @@ -2291,7 +2317,7 @@ return Status; DPRINT(MAX_TRACE, ("Found file '%s' at uncompressed offset (0x%lX). Size (%lu bytes) ControlId (0x%lX).\n", - (char*)File->FileName, + File->FileName, (ULONG)File->File.FileOffset, (ULONG)File->File.FileSize, (ULONG)File->File.FileControlID)); Modified: trunk/reactos/tools/cabman/cabinet.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/cabman/cabinet.h?rev… ============================================================================== --- trunk/reactos/tools/cabman/cabinet.h (original) +++ trunk/reactos/tools/cabman/cabinet.h Sat Feb 2 17:32:44 2008 @@ -347,8 +347,12 @@ /* Extracts a file from the current cabinet file */ ULONG ExtractFile(char* FileName); /* Select codec engine to use */ - void SelectCodec(ULONG Id); + void SelectCodec(LONG Id); + /* Returns if a codec engine is selected */ + bool IsCodecSelected(); #ifndef CAB_READ_ONLY + /* Sets the codec to use for compression (based on a string value) */ + bool SetCompressionCodec(char* CodecName); /* Creates a new cabinet file */ ULONG NewCabinet(); /* Forces a new disk to be created */ @@ -448,7 +452,7 @@ PCFFILE_NODE FileListHead; PCFFILE_NODE FileListTail; CCABCodec *Codec; - ULONG CodecId; + LONG CodecId; bool CodecSelected; void* InputBuffer; void* CurrentIBuffer; // Current offset in input buffer Modified: trunk/reactos/tools/cabman/dfp.cxx URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/cabman/dfp.cxx?rev=3… ============================================================================== --- trunk/reactos/tools/cabman/dfp.cxx (original) +++ trunk/reactos/tools/cabman/dfp.cxx Sat Feb 2 17:32:44 2008 @@ -1367,7 +1367,7 @@ if (i > 0) { CurrentString[i] = '\0'; - CurrentInteger = atoi((char*)CurrentString); + CurrentInteger = atoi(CurrentString); CurrentToken = TokenInteger; CurrentChar += i; return; Modified: trunk/reactos/tools/cabman/main.cxx URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/cabman/main.cxx?rev=… ============================================================================== --- trunk/reactos/tools/cabman/main.cxx (original) +++ trunk/reactos/tools/cabman/main.cxx Sat Feb 2 17:32:44 2008 @@ -24,9 +24,6 @@ //ULONG DebugTraceLevel = MAX_TRACE; #endif /* DBG */ - - -#define CM_VERSION "0.9" char* Pad(char* Str, char PadChar, ULONG Length) @@ -191,7 +188,7 @@ * FUNCTION: Display usage information on screen */ { - printf("ReactOS Cabinet Manager - Version %s\n\n", CM_VERSION); + printf("ReactOS Cabinet Manager\n\n"); printf("CABMAN [-D | -E] [-A] [-L dir] cabinet [filename ...]\n"); printf("CABMAN -C dirfile [-I] [-RC file] [-P dir]\n"); printf("CABMAN -S cabinet filename\n"); @@ -210,6 +207,9 @@ printf(" -I Don't create the cabinet, only the .inf file.\n"); printf(" -L dir Location to place extracted or generated files\n"); printf(" (default is current directory).\n"); + printf(" -M Specify the compression method to use\n"); + printf(" raw - No compression\n"); + printf(" mszip - MsZip compression (default)\n"); printf(" -N Don't create the .inf file, only the cabinet.\n"); printf(" -RC Specify file to put in cabinet reserved area\n"); printf(" (size must be less than 64KB).\n"); @@ -269,10 +269,28 @@ if (argv[i][2] == 0) { i++; - SetDestinationPath((char*)&argv[i][0]); + SetDestinationPath(&argv[i][0]); } else - SetDestinationPath((char*)&argv[i][1]); + SetDestinationPath(&argv[i][2]); + + break; + + case 'm': + case 'M': + // Set the compression codec (only affects compression, not decompression) + if(argv[i][2] == 0) + { + i++; + + if( !SetCompressionCodec(&argv[i][0]) ) + return false; + } + else + { + if( !SetCompressionCodec(&argv[i][2]) ) + return false; + } break; @@ -288,7 +306,7 @@ if (argv[i][3] == 0) { i++; - if (!SetCabinetReservedFile((char*)&argv[i][0])) + if (!SetCabinetReservedFile(&argv[i][0])) { printf("Cannot open cabinet reserved area file.\n"); return false; @@ -296,7 +314,7 @@ } else { - if (!SetCabinetReservedFile((char*)&argv[i][3])) + if (!SetCabinetReservedFile(&argv[i][3])) { printf("Cannot open cabinet reserved area file.\n"); return false; @@ -319,10 +337,10 @@ if (argv[i][2] == 0) { i++; - SetFileRelativePath((char*)&argv[i][0]); + SetFileRelativePath(&argv[i][0]); } else - SetFileRelativePath((char*)&argv[i][1]); + SetFileRelativePath(&argv[i][2]); break; @@ -336,7 +354,7 @@ if ((FoundCabinet) || (Mode == CM_MODE_CREATE)) { /* FIXME: There may be many of these if Mode != CM_MODE_CREATE */ - strcpy((char*)FileName, argv[i]); + strcpy(FileName, argv[i]); } else { @@ -352,8 +370,9 @@ return false; } - /* FIXME */ - SelectCodec(CAB_CODEC_MSZIP); + // Select MsZip by default for creating cabinets + if( (Mode == CM_MODE_CREATE || Mode == CM_MODE_CREATE_SIMPLE) && !IsCodecSelected() ) + SelectCodec(CAB_CODEC_MSZIP); return true; } @@ -366,10 +385,10 @@ { ULONG Status; - Status = Load((char*)&FileName); + Status = Load(FileName); if (Status != CAB_STATUS_SUCCESS) { - printf("Specified directive file could not be found: %s.\n", (char*)&FileName); + printf("Specified directive file could not be found: %s.\n", FileName); return false; } @@ -435,9 +454,9 @@ { if (Search.File->FileControlID != CAB_FILE_CONTINUED) { - printf("%s ", Date2Str((char*)&Str, Search.File->FileDate)); - printf("%s ", Time2Str((char*)&Str, Search.File->FileTime)); - printf("%s ", Attr2Str((char*)&Str, Search.File->Attributes)); + printf("%s ", Date2Str(Str, Search.File->FileDate)); + printf("%s ", Time2Str(Str, Search.File->FileTime)); + printf("%s ", Attr2Str(Str, Search.File->Attributes)); sprintf(Str, "%lu", Search.File->FileSize); printf("%s ", Pad(Str, ' ', 13)); printf("%s\n", Search.FileName); @@ -530,7 +549,7 @@ * FUNCTION: Process cabinet */ { - printf("ReactOS Cabinet Manager - Version %s\n\n", CM_VERSION); + printf("ReactOS Cabinet Manager\n\n"); switch (Mode) {

1 0

[dreimer] 32088: Commit a possibility to disable all @echo off with one variable: "_ROSBE_DEBUG" I use this a while already and think its a nice thing to find errors when playing around on the cmd files.
by dreimer＠svn.reactos.org 02 Feb '08

02 Feb '08

Author: dreimer Date: Sat Feb 2 16:03:35 2008 New Revision: 32088 URL: http://svn.reactos.org/svn/reactos?rev=32088&view=rev Log: Commit a possibility to disable all @echo off with one variable: "_ROSBE_DEBUG" I use this a while already and think its a nice thing to find errors when playing around on the cmd files. Modified: trunk/tools/RosBE/RosBE-Windows/Root/Build.cmd trunk/tools/RosBE/RosBE-Windows/Root/Clean.cmd trunk/tools/RosBE/RosBE-Windows/Root/Config.cmd trunk/tools/RosBE/RosBE-Windows/Root/Help.cmd trunk/tools/RosBE/RosBE-Windows/Root/MinGW.cmd trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd trunk/tools/RosBE/RosBE-Windows/Root/TimeDate.cmd trunk/tools/RosBE/RosBE-Windows/Root/chdefdir.cmd trunk/tools/RosBE/RosBE-Windows/Root/chdefgcc.cmd trunk/tools/RosBE/RosBE-Windows/Root/options.cmd trunk/tools/RosBE/RosBE-Windows/Root/reladdr2line.cmd trunk/tools/RosBE/RosBE-Windows/Root/rosbe-gcc-env.cmd trunk/tools/RosBE/RosBE-Windows/Root/sSVN.cmd trunk/tools/RosBE/RosBE-Windows/Root/scut.cmd Modified: trunk/tools/RosBE/RosBE-Windows/Root/Build.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Bui… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/Build.cmd (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/Build.cmd Sat Feb 2 16:03:35 2008 @@ -8,7 +8,11 @@ :: Peter Ward <dralnix(a)gmail.com> :: :: -@echo off + +if not defined _ROSBE_DEBUG set _ROSBE_DEBUG=0 +if %_ROSBE_DEBUG% == 0 ( + @echo off +) :: :: Check if config.template.rbuild is newer than config.rbuild, if it is then Modified: trunk/tools/RosBE/RosBE-Windows/Root/Clean.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Cle… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/Clean.cmd (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/Clean.cmd Sat Feb 2 16:03:35 2008 @@ -7,7 +7,11 @@ :: Peter Ward <dralnix(a)gmail.com> :: :: -@echo off + +if not defined _ROSBE_DEBUG set _ROSBE_DEBUG=0 +if %_ROSBE_DEBUG% == 0 ( + @echo off +) title Cleaning... Modified: trunk/tools/RosBE/RosBE-Windows/Root/Config.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Con… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/Config.cmd (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/Config.cmd Sat Feb 2 16:03:35 2008 @@ -6,7 +6,11 @@ :: COPYRIGHT: Copyright 2007 Daniel Reimer <reimer.daniel(a)freenet.de> :: :: -@echo off + +if not defined _ROSBE_DEBUG set _ROSBE_DEBUG=0 +if %_ROSBE_DEBUG% == 0 ( + @echo off +) title ReactOS Build Configurator Modified: trunk/tools/RosBE/RosBE-Windows/Root/Help.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Hel… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/Help.cmd (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/Help.cmd Sat Feb 2 16:03:35 2008 @@ -7,7 +7,11 @@ :: Peter Ward <dralnix(a)gmail.com> :: :: -@echo off + +if not defined _ROSBE_DEBUG set _ROSBE_DEBUG=0 +if %_ROSBE_DEBUG% == 0 ( + @echo off +) :: :: Check if we are displaying help on all commands, if so, display it. Modified: trunk/tools/RosBE/RosBE-Windows/Root/MinGW.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Min… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/MinGW.cmd (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/MinGW.cmd Sat Feb 2 16:03:35 2008 @@ -7,7 +7,11 @@ :: Peter Ward <dralnix(a)gmail.com> :: :: -@echo off + +if not defined _ROSBE_DEBUG set _ROSBE_DEBUG=0 +if %_ROSBE_DEBUG% == 0 ( + @echo off +) if not "%1" == "" ( cls Modified: trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Ros… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/RosBE.cmd Sat Feb 2 16:03:35 2008 @@ -8,7 +8,11 @@ :: Peter Ward <dralnix(a)gmail.com> :: :: -@echo off + +if not defined _ROSBE_DEBUG set _ROSBE_DEBUG=0 +if %_ROSBE_DEBUG% == 0 ( + @echo off +) :: :: Set defaults to work with and override them if edited by Modified: trunk/tools/RosBE/RosBE-Windows/Root/TimeDate.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/Tim… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/TimeDate.cmd (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/TimeDate.cmd Sat Feb 2 16:03:35 2008 @@ -7,7 +7,11 @@ :: Peter Ward <dralnix(a)gmail.com> :: :: -@echo off + +if not defined _ROSBE_DEBUG set _ROSBE_DEBUG=0 +if %_ROSBE_DEBUG% == 0 ( + @echo off +) :: :: Clear variables before use. Modified: trunk/tools/RosBE/RosBE-Windows/Root/chdefdir.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/chd… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/chdefdir.cmd (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/chdefdir.cmd Sat Feb 2 16:03:35 2008 @@ -8,7 +8,11 @@ :: Peter Ward <dralnix(a)gmail.com> :: :: -@echo off + +if not defined _ROSBE_DEBUG set _ROSBE_DEBUG=0 +if %_ROSBE_DEBUG% == 0 ( + @echo off +) title Change the current working ReactOS source directory... Modified: trunk/tools/RosBE/RosBE-Windows/Root/chdefgcc.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/chd… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/chdefgcc.cmd (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/chdefgcc.cmd Sat Feb 2 16:03:35 2008 @@ -6,7 +6,11 @@ :: COPYRIGHT: Copyright 2007 Daniel Reimer <reimer.daniel(a)freenet.de> :: Peter Ward <dralnix(a)gmail.com> :: -@echo off + +if not defined _ROSBE_DEBUG set _ROSBE_DEBUG=0 +if %_ROSBE_DEBUG% == 0 ( + @echo off +) if "%_ROSBE_MODE%" == "RosBE" ( title Change the current MinGW/GCC directory... Modified: trunk/tools/RosBE/RosBE-Windows/Root/options.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/opt… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/options.cmd (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/options.cmd Sat Feb 2 16:03:35 2008 @@ -6,7 +6,11 @@ :: COPYRIGHT: Copyright 2007 Daniel Reimer <reimer.daniel(a)freenet.de> :: :: -@echo off + +if not defined _ROSBE_DEBUG set _ROSBE_DEBUG=0 +if %_ROSBE_DEBUG% == 0 ( + @echo off +) title Options Modified: trunk/tools/RosBE/RosBE-Windows/Root/reladdr2line.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/rel… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/reladdr2line.cmd (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/reladdr2line.cmd Sat Feb 2 16:03:35 2008 @@ -8,7 +8,11 @@ :: Peter Ward <dralnix(a)gmail.com> :: :: -@echo off + +if not defined _ROSBE_DEBUG set _ROSBE_DEBUG=0 +if %_ROSBE_DEBUG% == 0 ( + @echo off +) title reladdr2line... Modified: trunk/tools/RosBE/RosBE-Windows/Root/rosbe-gcc-env.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/ros… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/rosbe-gcc-env.cmd (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/rosbe-gcc-env.cmd Sat Feb 2 16:03:35 2008 @@ -7,7 +7,11 @@ :: Peter Ward <dralnix(a)gmail.com> :: :: -@echo off + +if not defined _ROSBE_DEBUG set _ROSBE_DEBUG=0 +if %_ROSBE_DEBUG% == 0 ( + @echo off +) :: :: Check if we are running within the RosBE, and if not Modified: trunk/tools/RosBE/RosBE-Windows/Root/sSVN.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/sSV… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/sSVN.cmd (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/sSVN.cmd Sat Feb 2 16:03:35 2008 @@ -6,7 +6,11 @@ :: COPYRIGHT: Copyright 2007 Daniel Reimer <reimer.daniel(a)freenet.de> :: :: -@echo off + +if not defined _ROSBE_DEBUG set _ROSBE_DEBUG=0 +if %_ROSBE_DEBUG% == 0 ( + @echo off +) :: :: Receive the first parameter and decide what to do. Modified: trunk/tools/RosBE/RosBE-Windows/Root/scut.cmd URL: http://svn.reactos.org/svn/reactos/trunk/tools/RosBE/RosBE-Windows/Root/scu… ============================================================================== --- trunk/tools/RosBE/RosBE-Windows/Root/scut.cmd (original) +++ trunk/tools/RosBE/RosBE-Windows/Root/scut.cmd Sat Feb 2 16:03:35 2008 @@ -7,7 +7,11 @@ :: Daniel Reimer <reimer.daniel(a)freenet.de> :: Peter Ward <dralnix(a)gmail.com> :: -@echo off + +if not defined _ROSBE_DEBUG set _ROSBE_DEBUG=0 +if %_ROSBE_DEBUG% == 0 ( + @echo off +) :: Check if the parameter is an scut parameter, which can just be forwarded to the EXE file if /i "%1" == "add" goto paramcall

1 0

[cfinck] 32087: Get it to compile warning-free under MSVC (at /W3)
by cfinck＠svn.reactos.org 02 Feb '08

02 Feb '08

Author: cfinck Date: Sat Feb 2 15:05:05 2008 New Revision: 32087 URL: http://svn.reactos.org/svn/reactos?rev=32087&view=rev Log: Get it to compile warning-free under MSVC (at /W3) Modified: trunk/reactos/tools/cabman/cabinet.h trunk/reactos/tools/cabman/dfp.cxx Modified: trunk/reactos/tools/cabman/cabinet.h URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/cabman/cabinet.h?rev… ============================================================================== --- trunk/reactos/tools/cabman/cabinet.h (original) +++ trunk/reactos/tools/cabman/cabinet.h Sat Feb 2 15:05:05 2008 @@ -33,7 +33,9 @@ #define DIR_SEPARATOR_CHAR '\\' #define DIR_SEPARATOR_STRING "\\" -#define strcasecmp strcmpi +#define strcasecmp _strcmpi +#define strdup _strdup + #define AllocateMemory(size) HeapAlloc(GetProcessHeap(), 0, size) #define FreeMemory(buffer) HeapFree(GetProcessHeap(), 0, buffer) #define FILEHANDLE HANDLE Modified: trunk/reactos/tools/cabman/dfp.cxx URL: http://svn.reactos.org/svn/reactos/trunk/reactos/tools/cabman/dfp.cxx?rev=3… ============================================================================== --- trunk/reactos/tools/cabman/dfp.cxx (original) +++ trunk/reactos/tools/cabman/dfp.cxx Sat Feb 2 15:05:05 2008 @@ -29,7 +29,7 @@ return size; } #define ReadFileData(handle, buffer, size, bytesread) _ReadFileData(handle, buffer, size, bytesread) -static bool _ReadFileData(FILEHANDLE handle, void* buffer, ULONG size, PULONG bytesread) +static BOOL _ReadFileData(FILEHANDLE handle, void* buffer, ULONG size, PULONG bytesread) { return ReadFile(handle, buffer, size, (LPDWORD)bytesread, NULL); }

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