winehq.org
Sign In
Sign Up
Sign In
Sign Up
Manage this list
×
Keyboard Shortcuts
Thread View
j
: Next unread message
k
: Previous unread message
j a
: Jump to all threads
j l
: Jump to MailingList overview
2025
February
January
2024
December
November
October
September
August
July
June
May
April
March
February
January
2023
December
November
October
September
August
July
June
May
April
March
February
January
2022
December
November
October
September
August
July
June
May
April
March
February
January
2021
December
November
October
September
August
July
June
May
April
March
February
January
2020
December
November
October
September
August
July
June
May
April
March
February
January
2019
December
November
October
September
August
July
June
May
April
March
February
January
2018
December
November
October
September
August
July
June
May
April
March
February
January
2017
December
November
October
September
August
July
June
May
April
March
February
January
2016
December
November
October
September
August
July
June
May
April
March
February
January
2015
December
November
October
September
August
July
June
May
April
March
February
January
2014
December
November
October
September
August
July
June
May
April
March
February
January
2013
December
November
October
September
August
July
June
May
April
March
February
January
2012
December
November
October
September
August
July
June
May
April
March
February
January
2011
December
November
October
September
August
July
June
May
April
March
February
January
2010
December
November
October
September
August
July
June
May
April
March
February
January
2009
December
November
October
September
August
July
June
May
April
March
February
January
2008
December
November
October
September
August
July
June
May
April
March
February
January
2007
December
November
October
September
August
July
June
May
April
March
February
January
2006
December
November
October
September
August
July
June
May
April
March
February
January
2005
December
November
October
September
August
July
June
May
April
March
February
January
2004
December
November
October
September
August
July
June
May
April
March
February
January
2003
December
November
October
September
August
July
June
May
April
March
February
January
2002
December
November
October
September
August
July
June
May
April
March
February
January
2001
December
November
October
September
August
July
June
May
April
March
February
List overview
wine-commits
March 2007
----- 2025 -----
February 2025
January 2025
----- 2024 -----
December 2024
November 2024
October 2024
September 2024
August 2024
July 2024
June 2024
May 2024
April 2024
March 2024
February 2024
January 2024
----- 2023 -----
December 2023
November 2023
October 2023
September 2023
August 2023
July 2023
June 2023
May 2023
April 2023
March 2023
February 2023
January 2023
----- 2022 -----
December 2022
November 2022
October 2022
September 2022
August 2022
July 2022
June 2022
May 2022
April 2022
March 2022
February 2022
January 2022
----- 2021 -----
December 2021
November 2021
October 2021
September 2021
August 2021
July 2021
June 2021
May 2021
April 2021
March 2021
February 2021
January 2021
----- 2020 -----
December 2020
November 2020
October 2020
September 2020
August 2020
July 2020
June 2020
May 2020
April 2020
March 2020
February 2020
January 2020
----- 2019 -----
December 2019
November 2019
October 2019
September 2019
August 2019
July 2019
June 2019
May 2019
April 2019
March 2019
February 2019
January 2019
----- 2018 -----
December 2018
November 2018
October 2018
September 2018
August 2018
July 2018
June 2018
May 2018
April 2018
March 2018
February 2018
January 2018
----- 2017 -----
December 2017
November 2017
October 2017
September 2017
August 2017
July 2017
June 2017
May 2017
April 2017
March 2017
February 2017
January 2017
----- 2016 -----
December 2016
November 2016
October 2016
September 2016
August 2016
July 2016
June 2016
May 2016
April 2016
March 2016
February 2016
January 2016
----- 2015 -----
December 2015
November 2015
October 2015
September 2015
August 2015
July 2015
June 2015
May 2015
April 2015
March 2015
February 2015
January 2015
----- 2014 -----
December 2014
November 2014
October 2014
September 2014
August 2014
July 2014
June 2014
May 2014
April 2014
March 2014
February 2014
January 2014
----- 2013 -----
December 2013
November 2013
October 2013
September 2013
August 2013
July 2013
June 2013
May 2013
April 2013
March 2013
February 2013
January 2013
----- 2012 -----
December 2012
November 2012
October 2012
September 2012
August 2012
July 2012
June 2012
May 2012
April 2012
March 2012
February 2012
January 2012
----- 2011 -----
December 2011
November 2011
October 2011
September 2011
August 2011
July 2011
June 2011
May 2011
April 2011
March 2011
February 2011
January 2011
----- 2010 -----
December 2010
November 2010
October 2010
September 2010
August 2010
July 2010
June 2010
May 2010
April 2010
March 2010
February 2010
January 2010
----- 2009 -----
December 2009
November 2009
October 2009
September 2009
August 2009
July 2009
June 2009
May 2009
April 2009
March 2009
February 2009
January 2009
----- 2008 -----
December 2008
November 2008
October 2008
September 2008
August 2008
July 2008
June 2008
May 2008
April 2008
March 2008
February 2008
January 2008
----- 2007 -----
December 2007
November 2007
October 2007
September 2007
August 2007
July 2007
June 2007
May 2007
April 2007
March 2007
February 2007
January 2007
----- 2006 -----
December 2006
November 2006
October 2006
September 2006
August 2006
July 2006
June 2006
May 2006
April 2006
March 2006
February 2006
January 2006
----- 2005 -----
December 2005
November 2005
October 2005
September 2005
August 2005
July 2005
June 2005
May 2005
April 2005
March 2005
February 2005
January 2005
----- 2004 -----
December 2004
November 2004
October 2004
September 2004
August 2004
July 2004
June 2004
May 2004
April 2004
March 2004
February 2004
January 2004
----- 2003 -----
December 2003
November 2003
October 2003
September 2003
August 2003
July 2003
June 2003
May 2003
April 2003
March 2003
February 2003
January 2003
----- 2002 -----
December 2002
November 2002
October 2002
September 2002
August 2002
July 2002
June 2002
May 2002
April 2002
March 2002
February 2002
January 2002
----- 2001 -----
December 2001
November 2001
October 2001
September 2001
August 2001
July 2001
June 2001
May 2001
April 2001
March 2001
February 2001
wine-commits@winehq.org
3 participants
844 discussions
Start a n
N
ew thread
Jason Edmeades : cmd.exe: Prevent options to pushd.
by Alexandre Julliard
08 Mar '07
08 Mar '07
Module: wine Branch: master Commit: 91aa8a0a8d97512a2b87e9c3689d6cb04926a1b4 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=91aa8a0a8d97512a2b87e9c36…
Author: Jason Edmeades <us(a)edmeades.me.uk> Date: Thu Mar 8 00:44:46 2007 +0000 cmd.exe: Prevent options to pushd. --- programs/cmd/builtins.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 422042e..39cdff7 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -604,6 +604,12 @@ void WCMD_pushd (char *command) { struct env_stack *curdir; WCHAR *thisdir; + if (strchr(command, '/') != NULL) { + SetLastError(ERROR_INVALID_PARAMETER); + WCMD_print_error(); + return; + } + curdir = LocalAlloc (LMEM_FIXED, sizeof (struct env_stack)); thisdir = LocalAlloc (LMEM_FIXED, 1024 * sizeof(WCHAR)); if( !curdir || !thisdir ) {
1
0
0
0
Jason Edmeades : cmd.exe: Support PUSHD with wildcards.
by Alexandre Julliard
08 Mar '07
08 Mar '07
Module: wine Branch: master Commit: e5a26bc24d5dc390ebcce99dd6ae677c1f10ee34 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=e5a26bc24d5dc390ebcce99dd…
Author: Jason Edmeades <us(a)edmeades.me.uk> Date: Thu Mar 8 00:44:09 2007 +0000 cmd.exe: Support PUSHD with wildcards. --- programs/cmd/builtins.c | 9 ++++----- programs/cmd/wcmd.h | 2 +- programs/cmd/wcmdmain.c | 2 +- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 1880682..422042e 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -600,9 +600,8 @@ void WCMD_goto (void) { * Push a directory onto the stack */ -void WCMD_pushd (void) { +void WCMD_pushd (char *command) { struct env_stack *curdir; - BOOL status; WCHAR *thisdir; curdir = LocalAlloc (LMEM_FIXED, sizeof (struct env_stack)); @@ -615,9 +614,9 @@ void WCMD_pushd (void) { } GetCurrentDirectoryW (1024, thisdir); - status = SetCurrentDirectoryA (param1); - if (!status) { - WCMD_print_error (); + errorlevel = 0; + WCMD_setshow_default(command); + if (errorlevel) { LocalFree(curdir); LocalFree(thisdir); return; diff --git a/programs/cmd/wcmd.h b/programs/cmd/wcmd.h index af5b247..53f163c 100644 --- a/programs/cmd/wcmd.h +++ b/programs/cmd/wcmd.h @@ -55,7 +55,7 @@ void WCMD_pipe (char *command); void WCMD_popd (void); void WCMD_print_error (void); void WCMD_process_command (char *command); -void WCMD_pushd (void); +void WCMD_pushd (char *); int WCMD_read_console (char *string, int str_len); void WCMD_remove_dir (char *command); void WCMD_rename (void); diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 8fc23d6..1a093fa 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -640,7 +640,7 @@ void WCMD_process_command (char *command) WCMD_volume (0, p); break; case WCMD_PUSHD: - WCMD_pushd(); + WCMD_pushd(p); break; case WCMD_POPD: WCMD_popd();
1
0
0
0
Jason Edmeades : cmd.exe: Set errorlevel if CD fails.
by Alexandre Julliard
08 Mar '07
08 Mar '07
Module: wine Branch: master Commit: 121a830219d5064425e5d68df95da1c5ed110b7b URL:
http://source.winehq.org/git/wine.git/?a=commit;h=121a830219d5064425e5d68df…
Author: Jason Edmeades <us(a)edmeades.me.uk> Date: Thu Mar 8 00:43:32 2007 +0000 cmd.exe: Set errorlevel if CD fails. --- programs/cmd/builtins.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 8186695..1880682 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -1105,6 +1105,7 @@ void WCMD_setshow_default (char *command) { WINE_TRACE("Really changing to directory '%s'\n", string); status = SetCurrentDirectory (string); if (!status) { + errorlevel = 1; WCMD_print_error (); return; }
1
0
0
0
Jason Edmeades : cmd.exe: Wildcards in directory names for CD.
by Alexandre Julliard
08 Mar '07
08 Mar '07
Module: wine Branch: master Commit: 5c8c694e5e7bb0ea1a6de5e74f20cd208759c7a5 URL:
http://source.winehq.org/git/wine.git/?a=commit;h=5c8c694e5e7bb0ea1a6de5e74…
Author: Jason Edmeades <us(a)edmeades.me.uk> Date: Thu Mar 8 00:43:09 2007 +0000 cmd.exe: Wildcards in directory names for CD. --- programs/cmd/builtins.c | 33 +++++++++++++++++++++++++++++++++ 1 files changed, 33 insertions(+), 0 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 665e13d..8186695 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -1051,6 +1051,8 @@ void WCMD_setshow_default (char *command) { BOOL status; char string[1024]; char *pos; + WIN32_FIND_DATA fd; + HANDLE hff; WINE_TRACE("Request change to directory '%s'\n", command); if (strlen(command) == 0) { @@ -1068,6 +1070,37 @@ void WCMD_setshow_default (char *command) { } *pos = 0x00; + /* Search for approprate directory */ + WINE_TRACE("Looking for directory '%s'\n", string); + hff = FindFirstFile (string, &fd); + while (hff != INVALID_HANDLE_VALUE) { + if (fd.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) { + char fpath[MAX_PATH]; + char drive[10]; + char dir[MAX_PATH]; + char fname[MAX_PATH]; + char ext[MAX_PATH]; + + /* Convert path into actual directory spec */ + GetFullPathName (string, sizeof(fpath), fpath, NULL); + WCMD_splitpath(fpath, drive, dir, fname, ext); + + /* Rebuild path */ + sprintf(string, "%s%s%s", drive, dir, fd.cFileName); + + FindClose(hff); + hff = INVALID_HANDLE_VALUE; + break; + } + + /* Step on to next match */ + if (FindNextFile(hff, &fd) == 0) { + FindClose(hff); + hff = INVALID_HANDLE_VALUE; + break; + } + } + /* Change to that directory */ WINE_TRACE("Really changing to directory '%s'\n", string); status = SetCurrentDirectory (string);
1
0
0
0
Jason Edmeades : cmd.exe: Support unquoted directories in CD command.
by Alexandre Julliard
08 Mar '07
08 Mar '07
Module: wine Branch: master Commit: eb6d084fd66be7b38aec8a9762a9eb35997e577e URL:
http://source.winehq.org/git/wine.git/?a=commit;h=eb6d084fd66be7b38aec8a976…
Author: Jason Edmeades <us(a)edmeades.me.uk> Date: Thu Mar 8 00:42:33 2007 +0000 cmd.exe: Support unquoted directories in CD command. --- programs/cmd/builtins.c | 19 ++++++++++++++++--- programs/cmd/wcmd.h | 2 +- programs/cmd/wcmdmain.c | 2 +- 3 files changed, 18 insertions(+), 5 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 5420d91..665e13d 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -1046,18 +1046,31 @@ void WCMD_setshow_attrib (void) { * Set/Show the current default directory */ -void WCMD_setshow_default (void) { +void WCMD_setshow_default (char *command) { BOOL status; char string[1024]; + char *pos; - if (strlen(param1) == 0) { + WINE_TRACE("Request change to directory '%s'\n", command); + if (strlen(command) == 0) { GetCurrentDirectory (sizeof(string), string); strcat (string, "\n"); WCMD_output (string); } else { - status = SetCurrentDirectory (param1); + /* Remove any double quotes, which may be in the + middle, eg. cd "C:\Program Files"\Microsoft is ok */ + pos = string; + while (*command) { + if (*command != '"') *pos++ = *command; + command++; + } + *pos = 0x00; + + /* Change to that directory */ + WINE_TRACE("Really changing to directory '%s'\n", string); + status = SetCurrentDirectory (string); if (!status) { WCMD_print_error (); return; diff --git a/programs/cmd/wcmd.h b/programs/cmd/wcmd.h index 173a79c..af5b247 100644 --- a/programs/cmd/wcmd.h +++ b/programs/cmd/wcmd.h @@ -63,7 +63,7 @@ void WCMD_run_program (char *command, int called); void WCMD_setlocal (const char *command); void WCMD_setshow_attrib (void); void WCMD_setshow_date (void); -void WCMD_setshow_default (void); +void WCMD_setshow_default (char *command); void WCMD_setshow_env (char *command); void WCMD_setshow_path (char *command); void WCMD_setshow_prompt (void); diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index c8a7943..8fc23d6 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -543,7 +543,7 @@ void WCMD_process_command (char *command) break; case WCMD_CD: case WCMD_CHDIR: - WCMD_setshow_default (); + WCMD_setshow_default (p); break; case WCMD_CLS: WCMD_clear_screen ();
1
0
0
0
Jason Edmeades : cmd.exe: Support default colours for wineconsole.
by Alexandre Julliard
08 Mar '07
08 Mar '07
Module: wine Branch: master Commit: b9265bc3a9e9a19515fda20d111730f8acfb348c URL:
http://source.winehq.org/git/wine.git/?a=commit;h=b9265bc3a9e9a19515fda20d1…
Author: Jason Edmeades <us(a)edmeades.me.uk> Date: Thu Mar 8 00:40:54 2007 +0000 cmd.exe: Support default colours for wineconsole. --- programs/cmd/wcmdmain.c | 60 ++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 59 insertions(+), 1 deletions(-) diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 327cfba..c8a7943 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -262,10 +262,68 @@ int main (int argc, char *argv[]) /* Note: cmd.exe /c dir does not get a new color, /k dir does */ if (opt_t) { if (!(((opt_t & 0xF0) >> 4) == (opt_t & 0x0F))) { - defaultColor = opt_t; + defaultColor = opt_t & 0xFF; param1[0] = 0x00; WCMD_color(); } + } else { + /* Check HKCU\Software\Microsoft\Command Processor + Then HKLM\Software\Microsoft\Command Processor + for defaultcolour value + Note Can be supplied as DWORD or REG_SZ + Note2 When supplied as REG_SZ it's in decimal!!! */ + HKEY key; + DWORD type; + DWORD value=0, size=4; + + if (RegOpenKeyEx(HKEY_CURRENT_USER, "Software\\Microsoft\\Command Processor", + 0, KEY_READ, &key) == ERROR_SUCCESS) { + char strvalue[4]; + + /* See if DWORD or REG_SZ */ + if (RegQueryValueEx(key, "DefaultColor", NULL, &type, + NULL, NULL) == ERROR_SUCCESS) { + if (type == REG_DWORD) { + size = sizeof(DWORD); + RegQueryValueEx(key, "DefaultColor", NULL, NULL, + (LPBYTE)&value, &size); + } else if (type == REG_SZ) { + size = sizeof(strvalue); + RegQueryValueEx(key, "DefaultColor", NULL, NULL, + (LPBYTE)strvalue, &size); + value = strtoul(strvalue, NULL, 10); + } + } + } + + if (value == 0 && RegOpenKeyEx(HKEY_LOCAL_MACHINE, + "Software\\Microsoft\\Command Processor", + 0, KEY_READ, &key) == ERROR_SUCCESS) { + char strvalue[4]; + + /* See if DWORD or REG_SZ */ + if (RegQueryValueEx(key, "DefaultColor", NULL, &type, + NULL, NULL) == ERROR_SUCCESS) { + if (type == REG_DWORD) { + size = sizeof(DWORD); + RegQueryValueEx(key, "DefaultColor", NULL, NULL, + (LPBYTE)&value, &size); + } else if (type == REG_SZ) { + size = sizeof(strvalue); + RegQueryValueEx(key, "DefaultColor", NULL, NULL, + (LPBYTE)strvalue, &size); + value = strtoul(strvalue, NULL, 10); + } + } + } + + /* If one found, set the screen to that colour */ + if (!(((value & 0xF0) >> 4) == (value & 0x0F))) { + defaultColor = value & 0xFF; + param1[0] = 0x00; + WCMD_color(); + } + } if (opt_k) {
1
0
0
0
Jason Edmeades : cmd.exe: Add cmd.exe /T option.
by Alexandre Julliard
08 Mar '07
08 Mar '07
Module: wine Branch: master Commit: 00ad4c5317d41f0080444341118b395623a7676b URL:
http://source.winehq.org/git/wine.git/?a=commit;h=00ad4c5317d41f00804443411…
Author: Jason Edmeades <us(a)edmeades.me.uk> Date: Thu Mar 8 00:38:38 2007 +0000 cmd.exe: Add cmd.exe /T option. --- programs/cmd/wcmdmain.c | 14 +++++++++++++- 1 files changed, 13 insertions(+), 1 deletions(-) diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 1297299..327cfba 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -63,6 +63,7 @@ int main (int argc, char *argv[]) DWORD count; HANDLE h; int opt_q; + int opt_t = 0; opt_c=opt_k=opt_q=opt_s=0; while (*argv!=NULL) @@ -82,7 +83,9 @@ int main (int argc, char *argv[]) opt_k=1; } else if (tolower(c)=='s') { opt_s=1; - } else if (tolower(c)=='t' || tolower(c)=='x' || tolower(c)=='y') { + } else if (tolower(c)=='t' && (*argv)[2]==':') { + opt_t=strtoul(&(*argv)[3], NULL, 16); + } else if (tolower(c)=='x' || tolower(c)=='y') { /* Ignored for compatibility with Windows */ } @@ -256,6 +259,15 @@ int main (int argc, char *argv[]) ENABLE_ECHO_INPUT | ENABLE_PROCESSED_INPUT); SetConsoleTitle("Wine Command Prompt"); + /* Note: cmd.exe /c dir does not get a new color, /k dir does */ + if (opt_t) { + if (!(((opt_t & 0xF0) >> 4) == (opt_t & 0x0F))) { + defaultColor = opt_t; + param1[0] = 0x00; + WCMD_color(); + } + } + if (opt_k) { WCMD_process_command(cmd); HeapFree(GetProcessHeap(), 0, cmd);
1
0
0
0
Jason Edmeades : cmd.exe: Add COLOR command.
by Alexandre Julliard
08 Mar '07
08 Mar '07
Module: wine Branch: master Commit: e37463fab5635487e872b321c7ac72710b61b9aa URL:
http://source.winehq.org/git/wine.git/?a=commit;h=e37463fab5635487e872b321c…
Author: Jason Edmeades <us(a)edmeades.me.uk> Date: Thu Mar 8 00:37:44 2007 +0000 cmd.exe: Add COLOR command. --- programs/cmd/builtins.c | 51 ++++++++++++++++++++++++++++++++++++++++++++++- programs/cmd/wcmd.h | 4 ++- programs/cmd/wcmdmain.c | 7 ++++- 3 files changed, 58 insertions(+), 4 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 85f7980..5420d91 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -47,7 +47,7 @@ struct env_stack *pushd_directories; extern HINSTANCE hinst; extern char *inbuilt[]; -extern int echo_mode, verify_mode; +extern int echo_mode, verify_mode, defaultColor; extern char quals[MAX_PATH], param1[MAX_PATH], param2[MAX_PATH]; extern BATCH_CONTEXT *context; extern DWORD errorlevel; @@ -1631,3 +1631,52 @@ void WCMD_assoc (char *command) { /* Clean up */ RegCloseKey(key); } + +/**************************************************************************** + * WCMD_color + * + * Clear the terminal screen. + */ + +void WCMD_color (void) { + + /* Emulate by filling the screen from the top left to bottom right with + spaces, then moving the cursor to the top left afterwards */ + CONSOLE_SCREEN_BUFFER_INFO consoleInfo; + HANDLE hStdOut = GetStdHandle(STD_OUTPUT_HANDLE); + + if (param1[0] != 0x00 && strlen(param1) > 2) { + WCMD_output ("Argument invalid\n"); + return; + } + + if (GetConsoleScreenBufferInfo(hStdOut, &consoleInfo)) + { + COORD topLeft; + DWORD screenSize; + DWORD color = 0; + + screenSize = consoleInfo.dwSize.X * (consoleInfo.dwSize.Y + 1); + + topLeft.X = 0; + topLeft.Y = 0; + + /* Convert the color hex digits */ + if (param1[0] == 0x00) { + color = defaultColor; + } else { + color = strtoul(param1, NULL, 16); + } + + /* Fail if fg == bg color */ + if (((color & 0xF0) >> 4) == (color & 0x0F)) { + errorlevel = 1; + return; + } + + /* Set the current screen contents and ensure all future writes + remain this color */ + FillConsoleOutputAttribute(hStdOut, color, screenSize, topLeft, &screenSize); + SetConsoleTextAttribute(hStdOut, color); + } +} diff --git a/programs/cmd/wcmd.h b/programs/cmd/wcmd.h index 5474da7..173a79c 100644 --- a/programs/cmd/wcmd.h +++ b/programs/cmd/wcmd.h @@ -32,6 +32,7 @@ void WCMD_batch (char *, char *, int, char *, HANDLE); void WCMD_call (char *command); void WCMD_change_tty (void); void WCMD_clear_screen (void); +void WCMD_color (void); void WCMD_copy (void); void WCMD_create_dir (void); void WCMD_delete (char *); @@ -157,9 +158,10 @@ struct env_stack #define WCMD_PUSHD 38 #define WCMD_POPD 39 #define WCMD_ASSOC 40 +#define WCMD_COLOR 41 /* Must be last in list */ -#define WCMD_EXIT 41 +#define WCMD_EXIT 42 /* Some standard messages */ extern const char nyi[]; diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 1bea185..1297299 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -35,11 +35,11 @@ const char * const inbuilt[] = {"ATTRIB", "CALL", "CD", "CHDIR", "CLS", "COPY", "HELP", "IF", "LABEL", "MD", "MKDIR", "MOVE", "PATH", "PAUSE", "PROMPT", "REM", "REN", "RENAME", "RD", "RMDIR", "SET", "SHIFT", "TIME", "TITLE", "TYPE", "VERIFY", "VER", "VOL", - "ENDLOCAL", "SETLOCAL", "PUSHD", "POPD", "ASSOC", "EXIT" }; + "ENDLOCAL", "SETLOCAL", "PUSHD", "POPD", "ASSOC", "COLOR", "EXIT" }; HINSTANCE hinst; DWORD errorlevel; -int echo_mode = 1, verify_mode = 0; +int echo_mode = 1, verify_mode = 0, defaultColor = 7; static int opt_c, opt_k, opt_s; const char nyi[] = "Not Yet Implemented\n\n"; const char newline[] = "\n"; @@ -578,6 +578,9 @@ void WCMD_process_command (char *command) case WCMD_ASSOC: WCMD_assoc(p); break; + case WCMD_COLOR: + WCMD_color(); + break; case WCMD_EXIT: WCMD_exit (); break;
1
0
0
0
Alexandre Julliard : configure: Fixed default dependencies to work properly in test dirs too.
by Alexandre Julliard
08 Mar '07
08 Mar '07
Module: wine Branch: master Commit: a4b6ee366c4e06c7a144995650276a71ca2a5bbc URL:
http://source.winehq.org/git/wine.git/?a=commit;h=a4b6ee366c4e06c7a14499565…
Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 8 13:20:12 2007 +0100 configure: Fixed default dependencies to work properly in test dirs too. --- configure | 2 +- configure.ac | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure b/configure index 4f911a8..c80aa80 100755 --- a/configure +++ b/configure @@ -20180,7 +20180,7 @@ DEPENDENCIES="### Dependencies: Makefile: dummy -\$(MAKEDEP) -C\$(SRCDIR) -S\$(TOPSRCDIR) -T\$(TOPOBJDIR) \$(EXTRAINCL) \$(DEPEND_SRCS) -\$(ALL_OBJS): \$(IDL_GEN_HEADERS) +\$(OBJS): \$(IDL_GEN_HEADERS) \$(IDL_GEN_C_SRCS:.c=.o): \$(IDL_GEN_C_SRCS) \$(LEX_SRCS:.l=.yy.o): \$(LEX_SRCS:.l=.yy.c) \$(BISON_SRCS:.y=.tab.o): \$(BISON_SRCS:.y=.tab.c)" diff --git a/configure.ac b/configure.ac index 01b0224..3872bab 100644 --- a/configure.ac +++ b/configure.ac @@ -1474,7 +1474,7 @@ AC_SUBST(DEPENDENCIES,m4_if(m4_version_compare(m4_defn([m4_PACKAGE_VERSION]), [2 Makefile: dummy\\ -\$(MAKEDEP) -C\$(SRCDIR) -S\$(TOPSRCDIR) -T\$(TOPOBJDIR) \$(EXTRAINCL) \$(DEPEND_SRCS)\\ \\ -\$(ALL_OBJS): \$(IDL_GEN_HEADERS)\\ +\$(OBJS): \$(IDL_GEN_HEADERS)\\ \$(IDL_GEN_C_SRCS:.c=.o): \$(IDL_GEN_C_SRCS)\\ \$(LEX_SRCS:.l=.yy.o): \$(LEX_SRCS:.l=.yy.c)\\ \$(BISON_SRCS:.y=.tab.o): \$(BISON_SRCS:.y=.tab.c)"], @@ -1485,7 +1485,7 @@ Makefile: dummy\\ Makefile: dummy -\$(MAKEDEP) -C\$(SRCDIR) -S\$(TOPSRCDIR) -T\$(TOPOBJDIR) \$(EXTRAINCL) \$(DEPEND_SRCS) -\$(ALL_OBJS): \$(IDL_GEN_HEADERS) +\$(OBJS): \$(IDL_GEN_HEADERS) \$(IDL_GEN_C_SRCS:.c=.o): \$(IDL_GEN_C_SRCS) \$(LEX_SRCS:.l=.yy.o): \$(LEX_SRCS:.l=.yy.c) \$(BISON_SRCS:.y=.tab.o): \$(BISON_SRCS:.y=.tab.c)"]))
1
0
0
0
Alexandre Julliard : configure: Get rid of lex compatibility support, we require flex anyway.
by Alexandre Julliard
08 Mar '07
08 Mar '07
Module: wine Branch: master Commit: 4091627cd73c4214c9b84c025de125f1fdb53abd URL:
http://source.winehq.org/git/wine.git/?a=commit;h=4091627cd73c4214c9b84c025…
Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 8 13:19:50 2007 +0100 configure: Get rid of lex compatibility support, we require flex anyway. --- Make.rules.in | 5 +- configure | 250 ++++-------------------------------------------- configure.ac | 10 +- include/config.h.in | 4 - tools/widl/Makefile.in | 2 +- tools/wmc/Makefile.in | 2 +- tools/wrc/Makefile.in | 2 +- 7 files changed, 29 insertions(+), 246 deletions(-) Diff:
http://source.winehq.org/git/wine.git/?a=commitdiff;h=4091627cd73c4214c9b84…
1
0
0
0
← Newer
1
...
62
63
64
65
66
67
68
...
85
Older →
Jump to page:
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
Results per page:
10
25
50
100
200