February 2007 - Wine-commits

Jason Edmeades : cmd.exe: Add support for env vars DATE, TIME, CD.
by Alexandre Julliard 21 Feb '07

21 Feb '07

Module: wine Branch: master Commit: c6eee93a678d5a328ac6f26e049f000d2f515e43 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c6eee93a678d5a328ac6f26e0… Author: Jason Edmeades <us(a)edmeades.me.uk> Date: Tue Feb 20 00:41:28 2007 +0000 cmd.exe: Add support for env vars DATE, TIME, CD. --- programs/cmd/batch.c | 55 ++++++++++++++++++++++++++++++++++++++++++------- 1 files changed, 47 insertions(+), 8 deletions(-) diff --git a/programs/cmd/batch.c b/programs/cmd/batch.c index 384fedd..2044e28 100755 --- a/programs/cmd/batch.c +++ b/programs/cmd/batch.c @@ -153,14 +153,6 @@ int i; if (*(p+1) == '~') { WCMD_HandleTildaModifiers(&p, NULL); p++; - } else if (CompareString (LOCALE_USER_DEFAULT, - NORM_IGNORECASE | SORT_STRINGSORT, - (p+1), 11, "ERRORLEVEL%", -1) == 2) { - char output[10]; - sprintf(output, "%d", errorlevel); - s = strdup (p+12); - strcpy (p, output); - strcat (p, s); } else if ((i >= 0) && (i <= 9)) { s = strdup (p+2); t = WCMD_parameter (context -> command, i + context -> shift_count, NULL); @@ -175,6 +167,53 @@ int i; else *p = 0x00; strcat (p, s); free (s); + + /* Handle DATE, TIME, ERRORLEVEL and CD replacements allowing */ + /* override if existing env var called that name */ + } else if ((CompareString (LOCALE_USER_DEFAULT, + NORM_IGNORECASE | SORT_STRINGSORT, + (p+1), 11, "ERRORLEVEL%", -1) == 2) && + (GetEnvironmentVariable("ERRORLEVEL", cmd2, 1) == 0) && + (GetLastError() == ERROR_ENVVAR_NOT_FOUND)) { + char output[10]; + sprintf(output, "%d", errorlevel); + s = strdup (p+12); + strcpy (p, output); + strcat (p, s); + + } else if ((CompareString (LOCALE_USER_DEFAULT, + NORM_IGNORECASE | SORT_STRINGSORT, + (p+1), 5, "DATE%", -1) == 2) && + (GetEnvironmentVariable("DATE", cmd2, 1) == 0) && + (GetLastError() == ERROR_ENVVAR_NOT_FOUND)) { + + GetDateFormat(LOCALE_USER_DEFAULT, DATE_SHORTDATE, NULL, + NULL, cmd2, MAXSTRING); + s = strdup (p+6); + strcpy (p, cmd2); + strcat (p, s); + + } else if ((CompareString (LOCALE_USER_DEFAULT, + NORM_IGNORECASE | SORT_STRINGSORT, + (p+1), 5, "TIME%", -1) == 2) && + (GetEnvironmentVariable("TIME", cmd2, 1) == 0) && + (GetLastError() == ERROR_ENVVAR_NOT_FOUND)) { + GetTimeFormat(LOCALE_USER_DEFAULT, TIME_NOSECONDS, NULL, + NULL, cmd2, MAXSTRING); + s = strdup (p+6); + strcpy (p, cmd2); + strcat (p, s); + + } else if ((CompareString (LOCALE_USER_DEFAULT, + NORM_IGNORECASE | SORT_STRINGSORT, + (p+1), 3, "CD%", -1) == 2) && + (GetEnvironmentVariable("CD", cmd2, 1) == 0) && + (GetLastError() == ERROR_ENVVAR_NOT_FOUND)) { + GetCurrentDirectory (MAXSTRING, cmd2); + s = strdup (p+4); + strcpy (p, cmd2); + strcat (p, s); + } else { p++; }

1 0

Jason Edmeades : cmd.exe: Support return code if fail to launch program.
by Alexandre Julliard 21 Feb '07

21 Feb '07

Module: wine Branch: master Commit: 3bdb64149b9d89449a43757f298f33f53f636af9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3bdb64149b9d89449a43757f2… Author: Jason Edmeades <us(a)edmeades.me.uk> Date: Tue Feb 20 18:03:32 2007 +0000 cmd.exe: Support return code if fail to launch program. --- programs/cmd/wcmdmain.c | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 8077fb8..fa17d93 100755 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -662,6 +662,9 @@ char filetorun[MAX_PATH]; } if (!status) { WCMD_print_error (); + /* If a command fails to launch, it sets errorlevel 9009 - which + does not seem to have any associated constant definition */ + errorlevel = 9009; return; } if (!console) errorlevel = 0;

1 0

Jason Edmeades : cmd.exe: Add support for %ERRORLEVEL% in both batch and cmd line.
by Alexandre Julliard 21 Feb '07

21 Feb '07

Module: wine Branch: master Commit: 938719062df1bd17d4360c2e51d07423aee28ab1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=938719062df1bd17d4360c2e5… Author: Jason Edmeades <us(a)edmeades.me.uk> Date: Tue Feb 20 00:40:28 2007 +0000 cmd.exe: Add support for %ERRORLEVEL% in both batch and cmd line. --- programs/cmd/batch.c | 10 +++++++++- programs/cmd/wcmdmain.c | 21 ++++++++++++++++++++- 2 files changed, 29 insertions(+), 2 deletions(-) diff --git a/programs/cmd/batch.c b/programs/cmd/batch.c index 9532cbb..384fedd 100755 --- a/programs/cmd/batch.c +++ b/programs/cmd/batch.c @@ -146,13 +146,21 @@ int i; /* contents of fred, then the digit 1. Would need to remove */ /* ExpandEnvStrings to achieve this */ - /* Replace use of %0...%9 */ + /* Replace use of %0...%9 and errorlevel*/ p = cmd1; while ((p = strchr(p, '%'))) { i = *(p+1) - '0'; if (*(p+1) == '~') { WCMD_HandleTildaModifiers(&p, NULL); p++; + } else if (CompareString (LOCALE_USER_DEFAULT, + NORM_IGNORECASE | SORT_STRINGSORT, + (p+1), 11, "ERRORLEVEL%", -1) == 2) { + char output[10]; + sprintf(output, "%d", errorlevel); + s = strdup (p+12); + strcpy (p, output); + strcat (p, s); } else if ((i >= 0) && (i <= 9)) { s = strdup (p+2); t = WCMD_parameter (context -> command, i + context -> shift_count, NULL); diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index fa17d93..0e58197 100755 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -301,7 +301,7 @@ int main (int argc, char *argv[]) void WCMD_process_command (char *command) { - char *cmd, *p; + char *cmd, *p, *s; int status, i, len; DWORD count, creationDisposition; HANDLE h; @@ -309,6 +309,25 @@ void WCMD_process_command (char *command) SECURITY_ATTRIBUTES sa; /* + * Replace errorlevel with current value (This shrinks in + * place and hence no need to reallocate the memory yet) + */ + p = command; + while ((p = strchr(p, '%'))) { + if (CompareString (LOCALE_USER_DEFAULT, + NORM_IGNORECASE | SORT_STRINGSORT, + (p+1), 11, "ERRORLEVEL%", -1) == 2) { + char output[10]; + sprintf(output, "%d", errorlevel); + s = strdup (p+12); + strcpy (p, output); + strcat (p, s); + } else { + p++; + } + } + +/* * Expand up environment variables. */ len = ExpandEnvironmentStrings (command, NULL, 0);

1 0

Jason Edmeades : cmd.exe: Support :EOF in goto labels.
by Alexandre Julliard 21 Feb '07

21 Feb '07

Module: wine Branch: master Commit: 5482924735ce8de0c8f21edfebdbae00ddec7d4d URL: http://source.winehq.org/git/wine.git/?a=commit;h=5482924735ce8de0c8f21edfe… Author: Jason Edmeades <us(a)edmeades.me.uk> Date: Tue Feb 20 18:00:37 2007 +0000 cmd.exe: Support :EOF in goto labels. --- programs/cmd/builtins.c | 7 +++++++ 1 files changed, 7 insertions(+), 0 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index e61ad8e..9f4cb74 100755 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -433,6 +433,13 @@ char string[MAX_PATH]; return; } if (context != NULL) { + + /* Handle special :EOF label */ + if (lstrcmpi (":eof", param1) == 0) { + context -> skip_rest = TRUE; + return; + } + SetFilePointer (context -> h, 0, NULL, FILE_BEGIN); while (WCMD_fgets (string, sizeof(string), context -> h)) { if ((string[0] == ':') && (lstrcmpi (&string[1], param1) == 0)) return;

1 0

Jason Edmeades : cmd.exe: Add ~ modifiers for %0-9.
by Alexandre Julliard 21 Feb '07

21 Feb '07

Module: wine Branch: master Commit: fcec39fa2ef068fc72826251bae132be1a8bfe41 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fcec39fa2ef068fc72826251b… Author: Jason Edmeades <us(a)edmeades.me.uk> Date: Tue Feb 20 17:49:43 2007 +0000 cmd.exe: Add ~ modifiers for %0-9. --- programs/cmd/batch.c | 354 +++++++++++++++++++++++++++++++++++++++++++++++++- 1 files changed, 353 insertions(+), 1 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=fcec39fa2ef068fc72826…

1 0

Jason Edmeades : cmd.exe: Support PATH= as a valid command.
by Alexandre Julliard 21 Feb '07

21 Feb '07

Module: wine Branch: master Commit: 73587989e7ff1e2911c3901904ab034a2d051c36 URL: http://source.winehq.org/git/wine.git/?a=commit;h=73587989e7ff1e2911c390190… Author: Jason Edmeades <us(a)edmeades.me.uk> Date: Tue Feb 20 00:37:47 2007 +0000 cmd.exe: Support PATH= as a valid command. --- 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 9f4cb74..a81c90c 100755 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -963,6 +963,7 @@ DWORD status; } } else { + if (*command == '=') command++; /* Skip leading '=' */ status = SetEnvironmentVariable ("PATH", command); if (!status) WCMD_print_error(); }

1 0

Jason Edmeades : cmd.exe: Add support for %*.
by Alexandre Julliard 21 Feb '07

21 Feb '07

Module: wine Branch: master Commit: e7dc3f1a35d5ac473aff8cbc2fc5454e38be0bc9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e7dc3f1a35d5ac473aff8cbc2… Author: Jason Edmeades <us(a)edmeades.me.uk> Date: Tue Feb 20 18:02:29 2007 +0000 cmd.exe: Add support for %*. --- programs/cmd/batch.c | 11 ++++++++++- 1 files changed, 10 insertions(+), 1 deletions(-) diff --git a/programs/cmd/batch.c b/programs/cmd/batch.c index ec27489..52a773b 100755 --- a/programs/cmd/batch.c +++ b/programs/cmd/batch.c @@ -155,6 +155,14 @@ int i; strcpy (p, t); strcat (p, s); free (s); + } else if (*(p+1)=='*') { + char *startOfParms = NULL; + s = strdup (p+2); + t = WCMD_parameter (context -> command, 1, &startOfParms); + if (startOfParms != NULL) strcpy (p, startOfParms); + else *p = 0x00; + strcat (p, s); + free (s); } else { p++; } @@ -245,7 +253,8 @@ char *p; case '\0': return param; default: - if (where != NULL) *where = s; + /* Only return where if it is for the right parameter */ + if (where != NULL && i==n) *where = s; while ((*s != '\0') && (*s != ' ')) { *p++ = *s++; }

1 0

Jason Edmeades : cmd.exe: Support exit [/b] returncode.
by Alexandre Julliard 21 Feb '07

21 Feb '07

Module: wine Branch: master Commit: c36664891cdc48728a1fdddeda27335830115ef6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c36664891cdc48728a1fddded… Author: Jason Edmeades <us(a)edmeades.me.uk> Date: Tue Feb 20 17:49:08 2007 +0000 cmd.exe: Support exit [/b] returncode. --- programs/cmd/batch.c | 3 ++- programs/cmd/builtins.c | 19 +++++++++++++++++++ programs/cmd/wcmd.h | 2 ++ programs/cmd/wcmdmain.c | 5 +++-- 4 files changed, 26 insertions(+), 3 deletions(-) diff --git a/programs/cmd/batch.c b/programs/cmd/batch.c old mode 100644 new mode 100755 index 8beef16..ec27489 --- a/programs/cmd/batch.c +++ b/programs/cmd/batch.c @@ -87,13 +87,14 @@ BATCH_CONTEXT *prev_context; context -> command = command; context -> shift_count = 0; context -> prev_context = prev_context; + context -> skip_rest = FALSE; /* * Work through the file line by line. Specific batch commands are processed here, * the rest are handled by the main command processor. */ - while (WCMD_fgets (string, sizeof(string), h)) { + while (context -> skip_rest == FALSE && WCMD_fgets (string, sizeof(string), h)) { if (strlen(string) == MAXSTRING -1) { WCMD_output_asis( "Line in Batch processing possibly truncated. Using:\n"); WCMD_output_asis( string); diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 8715835..e61ad8e 100755 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -1159,3 +1159,22 @@ BOOL status; } return 1; } + +/************************************************************************** + * WCMD_exit + * + * Exit either the process, or just this batch program + * + */ + +void WCMD_exit (void) { + + int rc = atoi(param1); /* Note: atoi of empty parameter is 0 */ + + if (context && lstrcmpi(quals, "/B") == 0) { + errorlevel = rc; + context -> skip_rest = TRUE; + } else { + ExitProcess(rc); + } +} diff --git a/programs/cmd/wcmd.h b/programs/cmd/wcmd.h old mode 100644 new mode 100755 index de9d317..263412e --- a/programs/cmd/wcmd.h +++ b/programs/cmd/wcmd.h @@ -37,6 +37,7 @@ void WCMD_directory (void); void WCMD_echo (const char *); void WCMD_endlocal (void); void WCMD_enter_paged_mode(void); +void WCMD_exit (void); void WCMD_for (char *); void WCMD_give_help (char *command); void WCMD_goto (void); @@ -83,6 +84,7 @@ typedef struct { HANDLE h; /* Handle to the open batch file */ int shift_count; /* Number of SHIFT commands executed */ void *prev_context; /* Pointer to the previous context block */ + BOOL skip_rest; /* Skip the rest of the batch program and exit */ } BATCH_CONTEXT; #endif /* !RC_INVOKED */ diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c old mode 100644 new mode 100755 index e2fb450..8077fb8 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -244,7 +244,7 @@ int main (int argc, char *argv[]) else WCMD_process_command(cmd); HeapFree(GetProcessHeap(), 0, cmd); - return 0; + return errorlevel; } SetConsoleMode(GetStdHandle(STD_INPUT_HANDLE), ENABLE_LINE_INPUT | @@ -504,7 +504,8 @@ void WCMD_process_command (char *command) WCMD_volume (0, p); break; case WCMD_EXIT: - ExitProcess (0); + WCMD_exit (); + break; default: WCMD_run_program (whichcmd, 0); }

1 0

Jason Edmeades : cmd.exe: Add "if defined ..." support.
by Alexandre Julliard 21 Feb '07

21 Feb '07

Module: wine Branch: master Commit: 758a3977558f164e205e5683f138fc0ec21a7791 URL: http://source.winehq.org/git/wine.git/?a=commit;h=758a3977558f164e205e5683f… Author: Jason Edmeades <us(a)edmeades.me.uk> Date: Tue Feb 20 17:47:35 2007 +0000 cmd.exe: Add "if defined ..." support. --- programs/cmd/builtins.c | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c old mode 100644 new mode 100755 index 49548de..8715835 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -472,6 +472,12 @@ char condition[MAX_PATH], *command, *s; } WCMD_parameter (p, 2+negate, &command); } + else if (!lstrcmpi (condition, "defined")) { + if (GetEnvironmentVariableA(WCMD_parameter (p, 1+negate, NULL), NULL, 0) > 0) { + test = 1; + } + WCMD_parameter (p, 2+negate, &command); + } else if ((s = strstr (p, "=="))) { s += 2; if (!lstrcmpi (condition, WCMD_parameter (s, 0, NULL))) test = 1;

1 0

Stefan Dösinger : wined3d: Make sure volumes have memory allocated.
by Alexandre Julliard 21 Feb '07

21 Feb '07

Module: wine Branch: master Commit: 953940aada235dd06d449a18b88627b6968a7341 URL: http://source.winehq.org/git/wine.git/?a=commit;h=953940aada235dd06d449a18b… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Feb 20 23:02:30 2007 +0100 wined3d: Make sure volumes have memory allocated. --- dlls/wined3d/volume.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/dlls/wined3d/volume.c b/dlls/wined3d/volume.c index dc768e1..3fb3036 100644 --- a/dlls/wined3d/volume.c +++ b/dlls/wined3d/volume.c @@ -141,6 +141,10 @@ static HRESULT WINAPI IWineD3DVolumeImpl_LockBox(IWineD3DVolume *iface, WINED3DL IWineD3DVolumeImpl *This = (IWineD3DVolumeImpl *)iface; FIXME("(%p) : pBox=%p stub\n", This, pBox); + if(!This->resource.allocatedMemory) { + This->resource.allocatedMemory = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, This->resource.size); + } + /* fixme: should we really lock as such? */ TRACE("(%p) : box=%p, output pbox=%p, allMem=%p\n", This, pBox, pLockedVolume, This->resource.allocatedMemory);

1 0