March 2007 - Wine-commits - list.winehq.org

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

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

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

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

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

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

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

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

Alexandre Julliard : kernel32: Add missing limits.h include.
by Alexandre Julliard 08 Mar '07

08 Mar '07

Module: wine Branch: master Commit: 544a32f0e16b867e6c3a687f951d767d407d4583 URL: http://source.winehq.org/git/wine.git/?a=commit;h=544a32f0e16b867e6c3a687f9… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Mar 8 13:12:59 2007 +0100 kernel32: Add missing limits.h include. --- dlls/kernel32/heap.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/heap.c b/dlls/kernel32/heap.c index 44545cd..4fb4929 100644 --- a/dlls/kernel32/heap.c +++ b/dlls/kernel32/heap.c @@ -24,6 +24,7 @@ #include "wine/port.h" #include <assert.h> +#include <limits.h> #include <stdlib.h> #include <stdarg.h> #include <stdio.h>

1 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