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

Rob Shearman : ole32: Set output param to NULL in BindCtxImpl_EnumObjectParam.
by Alexandre Julliard March 8, 2007

March 8, 2007

Module: wine Branch: master Commit: 3d6070aebdbc47c0f4976701f2956debd4502ee3 URL: http://source.winehq.org/git/wine.git/?a=commit;h=3d6070aebdbc47c0f4976701f… Author: Rob Shearman <rob(a)codeweavers.com> Date: Thu Mar 8 11:01:06 2007 +0000 ole32: Set output param to NULL in BindCtxImpl_EnumObjectParam. --- dlls/ole32/bindctx.c | 6 +++++- dlls/ole32/tests/moniker.c | 1 - 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/ole32/bindctx.c b/dlls/ole32/bindctx.c index 636cdca..7de1986 100644 --- a/dlls/ole32/bindctx.c +++ b/dlls/ole32/bindctx.c @@ -423,7 +423,11 @@ BindCtxImpl_RevokeObjectParam(IBindCtx* iface,LPOLESTR ppenum) static HRESULT WINAPI BindCtxImpl_EnumObjectParam(IBindCtx* iface,IEnumString** pszkey) { - FIXME("(%p,%p),stub!\n",iface,pszkey); + TRACE("(%p,%p)\n",iface,pszkey); + + *pszkey = NULL; + + /* not implemented in native either */ return E_NOTIMPL; } diff --git a/dlls/ole32/tests/moniker.c b/dlls/ole32/tests/moniker.c index f084fbb..6bfe330 100644 --- a/dlls/ole32/tests/moniker.c +++ b/dlls/ole32/tests/moniker.c @@ -1487,7 +1487,6 @@ static void test_bind_context(void) hr = IBindCtx_EnumObjectParam(pBindCtx, &pEnumString); ok(hr == E_NOTIMPL, "IBindCtx_EnumObjectParam should have returned E_NOTIMPL instead of 0x%08x\n", hr); - todo_wine ok(!pEnumString, "pEnumString should be NULL\n"); hr = IBindCtx_RegisterObjectBound(pBindCtx, NULL);

1 0

Rob Shearman : ole32: Fix BindCtxImpl_GetBindOptions to return the correct locale and to not fail if the input size is too large .
by Alexandre Julliard March 8, 2007

March 8, 2007

Module: wine Branch: master Commit: bdefb46d29a8d5a9cf9f3794648565c5dbfd7908 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bdefb46d29a8d5a9cf9f37946… Author: Rob Shearman <rob(a)codeweavers.com> Date: Thu Mar 8 11:00:21 2007 +0000 ole32: Fix BindCtxImpl_GetBindOptions to return the correct locale and to not fail if the input size is too large. --- dlls/ole32/bindctx.c | 11 +++++------ dlls/ole32/tests/moniker.c | 10 +--------- 2 files changed, 6 insertions(+), 15 deletions(-) diff --git a/dlls/ole32/bindctx.c b/dlls/ole32/bindctx.c index 9a7e4df..636cdca 100644 --- a/dlls/ole32/bindctx.c +++ b/dlls/ole32/bindctx.c @@ -20,14 +20,15 @@ #include <stdarg.h> #include <string.h> -#include <assert.h> #define COBJMACROS #include "winerror.h" #include "windef.h" #include "winbase.h" +#include "winnls.h" #include "objbase.h" + #include "wine/debug.h" WINE_DEFAULT_DEBUG_CHANNEL(ole); @@ -273,10 +274,8 @@ BindCtxImpl_GetBindOptions(IBindCtx* iface,BIND_OPTS *pbindopts) return E_POINTER; if (pbindopts->cbStruct > sizeof(BIND_OPTS2)) - { - WARN("invalid size\n"); - return E_INVALIDARG; /* FIXME : not verified */ - } + pbindopts->cbStruct = sizeof(BIND_OPTS2); + memcpy(pbindopts, &This->bindOption2, pbindopts->cbStruct); return S_OK; } @@ -510,7 +509,7 @@ static HRESULT BindCtxImpl_Construct(BindCtxImpl* This) This->bindOption2.dwTrackFlags = 0; This->bindOption2.dwClassContext = CLSCTX_SERVER; - This->bindOption2.locale = 1033; + This->bindOption2.locale = GetThreadLocale(); This->bindOption2.pServerInfo = 0; /* Initialize the bindctx table */ diff --git a/dlls/ole32/tests/moniker.c b/dlls/ole32/tests/moniker.c index e628aca..f084fbb 100644 --- a/dlls/ole32/tests/moniker.c +++ b/dlls/ole32/tests/moniker.c @@ -1455,10 +1455,8 @@ static void test_bind_context(void) bind_opts.cbStruct = -1; hr = IBindCtx_GetBindOptions(pBindCtx, (BIND_OPTS *)&bind_opts); - todo_wine { ok_ole_success(hr, "IBindCtx_GetBindOptions"); ok(bind_opts.cbStruct == sizeof(bind_opts), "bind_opts.cbStruct was %d\n", bind_opts.cbStruct); - } bind_opts.cbStruct = sizeof(bind_opts); hr = IBindCtx_GetBindOptions(pBindCtx, (BIND_OPTS *)&bind_opts); @@ -1470,13 +1468,7 @@ static void test_bind_context(void) ok(bind_opts.dwTrackFlags == 0, "bind_opts.dwTrackFlags was 0x%x instead of 0\n", bind_opts.dwTrackFlags); ok(bind_opts.dwClassContext == (CLSCTX_INPROC_SERVER|CLSCTX_LOCAL_SERVER|CLSCTX_REMOTE_SERVER), "bind_opts.dwClassContext should have been 0x15 instead of 0x%x\n", bind_opts.dwClassContext); - if (bind_opts.locale != GetThreadLocale()) /* should be removed once wine is fixed */ - { - todo_wine - ok(bind_opts.locale == GetThreadLocale(), "bind_opts.locale should have been 0x%x instead of 0x%x\n", GetThreadLocale(), bind_opts.locale); - } - else - ok(bind_opts.locale == GetThreadLocale(), "bind_opts.locale should have been 0x%x instead of 0x%x\n", GetThreadLocale(), bind_opts.locale); + ok(bind_opts.locale == GetThreadLocale(), "bind_opts.locale should have been 0x%x instead of 0x%x\n", GetThreadLocale(), bind_opts.locale); ok(bind_opts.pServerInfo == NULL, "bind_opts.pServerInfo should have been NULL instead of %p\n", bind_opts.pServerInfo);

1 0

Rob Shearman : ole32: CreateBindCtx should fail if reserved parameter is not zero.
by Alexandre Julliard March 8, 2007

March 8, 2007

Module: wine Branch: master Commit: bf4b5188e0f6881609542855589dc5b4746d96c1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=bf4b5188e0f68816095428555… Author: Rob Shearman <rob(a)codeweavers.com> Date: Thu Mar 8 10:59:38 2007 +0000 ole32: CreateBindCtx should fail if reserved parameter is not zero. --- dlls/ole32/bindctx.c | 8 ++++++++ dlls/ole32/tests/moniker.c | 1 - 2 files changed, 8 insertions(+), 1 deletions(-) diff --git a/dlls/ole32/bindctx.c b/dlls/ole32/bindctx.c index 2dae2c4..9a7e4df 100644 --- a/dlls/ole32/bindctx.c +++ b/dlls/ole32/bindctx.c @@ -536,6 +536,14 @@ HRESULT WINAPI CreateBindCtx(DWORD reserved, LPBC * ppbc) TRACE("(%d,%p)\n",reserved,ppbc); + *ppbc = NULL; + + if (reserved != 0) + { + ERR("reserved should be 0, not 0x%x\n", reserved); + return E_INVALIDARG; + } + newBindCtx = HeapAlloc(GetProcessHeap(), 0, sizeof(BindCtxImpl)); if (newBindCtx == 0) return E_OUTOFMEMORY; diff --git a/dlls/ole32/tests/moniker.c b/dlls/ole32/tests/moniker.c index 861fc33..e628aca 100644 --- a/dlls/ole32/tests/moniker.c +++ b/dlls/ole32/tests/moniker.c @@ -1448,7 +1448,6 @@ static void test_bind_context(void) static const WCHAR wszParamName[] = {'G','e','m','m','a',0}; hr = CreateBindCtx(0xdeadbeef, &pBindCtx); - todo_wine ok(hr == E_INVALIDARG, "CreateBindCtx with reserved value non-zero should have returned E_INVALIDARG instead of 0x%08x\n", hr); hr = CreateBindCtx(0, &pBindCtx);

1 0

Jason Edmeades : cmd.exe: Support SHIFT /n option.
by Alexandre Julliard March 8, 2007

March 8, 2007

Module: wine Branch: master Commit: 612dc9d35d9f8e4d7e1faaf992c442e596a49f7c URL: http://source.winehq.org/git/wine.git/?a=commit;h=612dc9d35d9f8e4d7e1faaf99… Author: Jason Edmeades <us(a)edmeades.me.uk> Date: Thu Mar 8 00:50:37 2007 +0000 cmd.exe: Support SHIFT /n option. --- programs/cmd/batch.c | 4 ++-- programs/cmd/builtins.c | 25 +++++++++++++++++++++++-- programs/cmd/wcmd.h | 4 ++-- programs/cmd/wcmdmain.c | 4 ++-- 4 files changed, 29 insertions(+), 8 deletions(-) diff --git a/programs/cmd/batch.c b/programs/cmd/batch.c index 4624ea9..0824c27 100644 --- a/programs/cmd/batch.c +++ b/programs/cmd/batch.c @@ -89,7 +89,7 @@ void WCMD_batch (char *file, char *command, int called, char *startLabel, HANDLE context = (BATCH_CONTEXT *)LocalAlloc (LMEM_FIXED, sizeof (BATCH_CONTEXT)); context -> h = h; context -> command = command; - context -> shift_count = 0; + memset(context -> shift_count, 0x00, sizeof(context -> shift_count)); context -> prev_context = prev_context; context -> skip_rest = FALSE; @@ -386,7 +386,7 @@ void WCMD_HandleTildaModifiers(char **start, char *forVariable) { /* Extract the parameter to play with */ if ((*lastModifier >= '0' && *lastModifier <= '9')) { strcpy(outputparam, WCMD_parameter (context -> command, - *lastModifier-'0' + context -> shift_count, NULL)); + *lastModifier-'0' + context -> shift_count[*lastModifier-'0'], NULL)); } else { /* FIXME: Retrieve 'for' variable %c\n", *lastModifier); */ /* Need to get 'for' loop variable into outputparam */ diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 2721cb5..d8c3967 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -1388,11 +1388,32 @@ void WCMD_setshow_time (void) { * WCMD_shift * * Shift batch parameters. + * Optional /n says where to start shifting (n=0-8) */ -void WCMD_shift (void) { +void WCMD_shift (char *command) { + int start; - if (context != NULL) context -> shift_count++; + if (context != NULL) { + char *pos = strchr(command, '/'); + int i; + + if (pos == NULL) { + start = 0; + } else if (*(pos+1)>='0' && *(pos+1)<='8') { + start = (*(pos+1) - '0'); + } else { + SetLastError(ERROR_INVALID_PARAMETER); + WCMD_print_error(); + return; + } + + WINE_TRACE("Shifting variables, starting at %d\n", start); + for (i=start;i<=8;i++) { + context -> shift_count[i] = context -> shift_count[i+1] + 1; + } + context -> shift_count[9] = context -> shift_count[9] + 1; + } } diff --git a/programs/cmd/wcmd.h b/programs/cmd/wcmd.h index e7ffa94..d43e1cd 100644 --- a/programs/cmd/wcmd.h +++ b/programs/cmd/wcmd.h @@ -68,7 +68,7 @@ void WCMD_setshow_env (char *command); void WCMD_setshow_path (char *command); void WCMD_setshow_prompt (void); void WCMD_setshow_time (void); -void WCMD_shift (void); +void WCMD_shift (char *command); void WCMD_show_prompt (void); void WCMD_title (char *); void WCMD_type (void); @@ -91,7 +91,7 @@ void WCMD_splitpath(const CHAR* path, CHAR* drv, CHAR* dir, CHAR* name, CHAR* ex typedef struct { char *command; /* The command which invoked the batch file */ HANDLE h; /* Handle to the open batch file */ - int shift_count; /* Number of SHIFT commands executed */ + int shift_count[10]; /* Offset in terms of shifts for %0 - %9 */ void *prev_context; /* Pointer to the previous context block */ BOOL skip_rest; /* Skip the rest of the batch program and exit */ } BATCH_CONTEXT; diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index de6aa6d..1dcf1e5 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -411,7 +411,7 @@ void WCMD_process_command (char *command) /* Replace use of %0...%9 if in batch program*/ } else if (context && (i >= 0) && (i <= 9)) { s = strdup (p+2); - t = WCMD_parameter (context -> command, i + context -> shift_count, NULL); + t = WCMD_parameter (context -> command, i + context -> shift_count[i], NULL); strcpy (p, t); strcat (p, s); free (s); @@ -629,7 +629,7 @@ void WCMD_process_command (char *command) WCMD_setshow_env (p); break; case WCMD_SHIFT: - WCMD_shift (); + WCMD_shift (p); break; case WCMD_TIME: WCMD_setshow_time ();

1 0

Jason Edmeades : cmd.exe: Add support for CD /D.
by Alexandre Julliard March 8, 2007

March 8, 2007

Module: wine Branch: master Commit: ffbaedef51c641051f70ddd74b2839753b3cc932 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ffbaedef51c641051f70ddd74… Author: Jason Edmeades <us(a)edmeades.me.uk> Date: Thu Mar 8 00:50:14 2007 +0000 cmd.exe: Add support for CD /D. --- programs/cmd/builtins.c | 31 +++++++++++++++++++++++++++---- 1 files changed, 27 insertions(+), 4 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 6a1a3a6..2721cb5 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -619,6 +619,8 @@ void WCMD_pushd (char *command) { return; } + /* Change directory using CD code with /D parameter */ + strcpy(quals, "/D"); GetCurrentDirectoryW (1024, thisdir); errorlevel = 0; WCMD_setshow_default(command); @@ -1075,15 +1077,25 @@ void WCMD_setshow_default (char *command) { BOOL status; char string[1024]; + char cwd[1024]; char *pos; WIN32_FIND_DATA fd; HANDLE hff; WINE_TRACE("Request change to directory '%s'\n", command); + + /* Skip /D and trailing whitespace if on the front of the command line */ + if (CompareString (LOCALE_USER_DEFAULT, + NORM_IGNORECASE | SORT_STRINGSORT, + command, 2, "/D", -1) == 2) { + command += 2; + while (*command && *command==' ') command++; + } + + GetCurrentDirectory (sizeof(cwd), cwd); if (strlen(command) == 0) { - GetCurrentDirectory (sizeof(string), string); - strcat (string, "\n"); - WCMD_output (string); + strcat (cwd, "\n"); + WCMD_output (cwd); } else { /* Remove any double quotes, which may be in the @@ -1134,9 +1146,20 @@ void WCMD_setshow_default (char *command) { errorlevel = 1; WCMD_print_error (); return; + } else { + + /* Restore old directory if drive letter would change, and + CD x:\directory /D (or pushd c:\directory) not supplied */ + if ((strstr(quals, "/D") == NULL) && + (param1[1] == ':') && (toupper(param1[0]) != toupper(cwd[0]))) { + SetCurrentDirectory(cwd); + } } - /* Set special =C: type environment variable */ + /* Set special =C: type environment variable, for drive letter of + change of directory, even if path was restored due to missing + /D (allows changing drive letter when not resident on that + drive */ if ((string[1] == ':') && IsCharAlpha (string[0])) { char env[4]; strcpy(env, "=");

1 0

Jason Edmeades : cmd.exe: setlocal and endlocal should preserve drive and directory.
by Alexandre Julliard March 8, 2007

March 8, 2007

Module: wine Branch: master Commit: 86140e3fbb0ac108314f4db6d504c62a4a7cf3bb URL: http://source.winehq.org/git/wine.git/?a=commit;h=86140e3fbb0ac108314f4db6d… Author: Jason Edmeades <us(a)edmeades.me.uk> Date: Thu Mar 8 00:48:49 2007 +0000 cmd.exe: setlocal and endlocal should preserve drive and directory. --- programs/cmd/builtins.c | 24 ++++++++++++++++++++++-- programs/cmd/wcmd.h | 5 ++++- 2 files changed, 26 insertions(+), 3 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 5149159..6a1a3a6 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -893,6 +893,7 @@ static WCHAR *WCMD_dupenv( const WCHAR *env ) void WCMD_setlocal (const char *s) { WCHAR *env; struct env_stack *env_copy; + char cwd[MAX_PATH]; /* DISABLEEXTENSIONS ignored */ @@ -910,11 +911,16 @@ void WCMD_setlocal (const char *s) { { env_copy->next = saved_environment; saved_environment = env_copy; + + /* Save the current drive letter */ + GetCurrentDirectory (MAX_PATH, cwd); + env_copy->cwd = cwd[0]; } else LocalFree (env_copy); FreeEnvironmentStringsW (env); + } /***************************************************************************** @@ -935,6 +941,8 @@ static inline WCHAR *WCMD_strchrW(WCHAR *str, WCHAR ch) * WCMD_endlocal * * endlocal pops the environment off a stack + * Note: When searching for '=', search from char position 1, to handle + * special internal environment variables =C:, =D: etc */ void WCMD_endlocal (void) { WCHAR *env, *old, *p; @@ -954,7 +962,7 @@ void WCMD_endlocal (void) { len = 0; while (old[len]) { n = lstrlenW(&old[len]) + 1; - p = WCMD_strchrW(&old[len], '='); + p = WCMD_strchrW(&old[len] + 1, '='); if (p) { *p++ = 0; @@ -970,7 +978,7 @@ void WCMD_endlocal (void) { len = 0; while (env[len]) { n = lstrlenW(&env[len]) + 1; - p = WCMD_strchrW(&env[len], '='); + p = WCMD_strchrW(&env[len] + 1, '='); if (p) { *p++ = 0; @@ -978,6 +986,18 @@ void WCMD_endlocal (void) { } len += n; } + + /* Restore current drive letter */ + if (IsCharAlpha(temp->cwd)) { + char envvar[4]; + char cwd[MAX_PATH]; + sprintf(envvar, "=%c:", temp->cwd); + if (GetEnvironmentVariable(envvar, cwd, MAX_PATH)) { + WINE_TRACE("Resetting cwd to %s\n", cwd); + SetCurrentDirectory(cwd); + } + } + LocalFree (env); LocalFree (temp); } diff --git a/programs/cmd/wcmd.h b/programs/cmd/wcmd.h index 53f163c..e7ffa94 100644 --- a/programs/cmd/wcmd.h +++ b/programs/cmd/wcmd.h @@ -101,7 +101,10 @@ typedef struct { struct env_stack { struct env_stack *next; - int stackdepth; /* Only used for pushd and popd */ + union { + int stackdepth; /* Only used for pushd and popd */ + char cwd; /* Only used for set/endlocal */ + }; WCHAR *strings; };

1 0

Jason Edmeades : cmd.exe: Hide new internal vars during SET.
by Alexandre Julliard March 8, 2007

March 8, 2007

Module: wine Branch: master Commit: d1317f55784227a4bac435b78d3dbe45a6838e83 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d1317f55784227a4bac435b78… Author: Jason Edmeades <us(a)edmeades.me.uk> Date: Thu Mar 8 00:48:17 2007 +0000 cmd.exe: Hide new internal vars during SET. --- programs/cmd/builtins.c | 9 ++++++--- 1 files changed, 6 insertions(+), 3 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index f38cd97..5149159 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -1210,9 +1210,12 @@ static int WCMD_setshow_sortenv(const char *s, const char *stub) if (!stub || CompareString (LOCALE_USER_DEFAULT, NORM_IGNORECASE | SORT_STRINGSORT, str[i], stublen, stub, -1) == 2) { - WCMD_output_asis(str[i]); - WCMD_output_asis("\n"); - displayedcount++; + /* Don't display special internal variables */ + if (str[i][0] != '=') { + WCMD_output_asis(str[i]); + WCMD_output_asis("\n"); + displayedcount++; + } } }

1 0

Jason Edmeades : cmd.exe: Add support for working directories per drive.
by Alexandre Julliard March 8, 2007

March 8, 2007

Module: wine Branch: master Commit: 2b03d7d75f5d6ff29796cfc51e625faf5ab8a4cb URL: http://source.winehq.org/git/wine.git/?a=commit;h=2b03d7d75f5d6ff29796cfc51… Author: Jason Edmeades <us(a)edmeades.me.uk> Date: Thu Mar 8 00:47:45 2007 +0000 cmd.exe: Add support for working directories per drive. --- programs/cmd/builtins.c | 11 +++++++++++ programs/cmd/wcmdmain.c | 11 +++++++++++ 2 files changed, 22 insertions(+), 0 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 4c80289..f38cd97 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -1108,12 +1108,23 @@ void WCMD_setshow_default (char *command) { /* Change to that directory */ WINE_TRACE("Really changing to directory '%s'\n", string); + status = SetCurrentDirectory (string); if (!status) { errorlevel = 1; WCMD_print_error (); return; } + + /* Set special =C: type environment variable */ + if ((string[1] == ':') && IsCharAlpha (string[0])) { + char env[4]; + strcpy(env, "="); + strncpy(env+1, string, 2); + env[3] = 0x00; + SetEnvironmentVariable(env, string); + } + } return; } diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 1a093fa..de6aa6d 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -460,6 +460,17 @@ void WCMD_process_command (char *command) */ if ((cmd[1] == ':') && IsCharAlpha (cmd[0]) && (strlen(cmd) == 2)) { + char envvar[5]; + char dir[MAX_PATH]; + + /* According to MSDN CreateProcess docs, special env vars record + the current directory on each drive, in the form =C: + so see if one specified, and if so go back to it */ + strcpy(envvar, "="); + strcat(envvar, cmd); + if (GetEnvironmentVariable(envvar, dir, MAX_PATH) == 0) { + sprintf(cmd, "%s\\", cmd); + } status = SetCurrentDirectory (cmd); if (!status) WCMD_print_error (); HeapFree( GetProcessHeap(), 0, cmd );

1 0

Jason Edmeades : cmd.exe: Support TIME /T option.
by Alexandre Julliard March 8, 2007

March 8, 2007

Module: wine Branch: master Commit: b6ed73b1acb0211c2ee646f189729e966094cc83 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b6ed73b1acb0211c2ee646f18… Author: Jason Edmeades <us(a)edmeades.me.uk> Date: Thu Mar 8 00:45:27 2007 +0000 cmd.exe: Support TIME /T option. --- programs/cmd/builtins.c | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index cdedc8a..4c80289 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -1311,10 +1311,13 @@ void WCMD_setshow_time (void) { GetLocalTime(&st); if (GetTimeFormat (LOCALE_USER_DEFAULT, 0, &st, NULL, curtime, sizeof(curtime))) { - WCMD_output ("Current Time is %s\nEnter new time: ", curtime); - ReadFile (GetStdHandle(STD_INPUT_HANDLE), buffer, sizeof(buffer), &count, NULL); - if (count > 2) { - WCMD_output (nyi); + WCMD_output ("Current Time is %s\n", curtime); + if (strstr (quals, "/T") == NULL) { + WCMD_output ("Enter new time: ", curtime); + ReadFile (GetStdHandle(STD_INPUT_HANDLE), buffer, sizeof(buffer), &count, NULL); + if (count > 2) { + WCMD_output (nyi); + } } } else WCMD_print_error ();

1 0

Jason Edmeades : cmd.exe: Support DATE /T option.
by Alexandre Julliard March 8, 2007

March 8, 2007

Module: wine Branch: master Commit: 988ef41da9b144a2962f2b1d0276be7c5d85b1cc URL: http://source.winehq.org/git/wine.git/?a=commit;h=988ef41da9b144a2962f2b1d0… Author: Jason Edmeades <us(a)edmeades.me.uk> Date: Thu Mar 8 00:45:05 2007 +0000 cmd.exe: Support DATE /T option. --- programs/cmd/builtins.c | 11 +++++++---- 1 files changed, 7 insertions(+), 4 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 39cdff7..cdedc8a 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -1133,10 +1133,13 @@ void WCMD_setshow_date (void) { if (lstrlen(param1) == 0) { if (GetDateFormat (LOCALE_USER_DEFAULT, 0, NULL, NULL, curdate, sizeof(curdate))) { - WCMD_output ("Current Date is %s\nEnter new date: ", curdate); - ReadFile (GetStdHandle(STD_INPUT_HANDLE), buffer, sizeof(buffer), &count, NULL); - if (count > 2) { - WCMD_output (nyi); + WCMD_output ("Current Date is %s\n", curdate); + if (strstr (quals, "/T") == NULL) { + WCMD_output("Enter new date: "); + ReadFile (GetStdHandle(STD_INPUT_HANDLE), buffer, sizeof(buffer), &count, NULL); + if (count > 2) { + WCMD_output (nyi); + } } } else WCMD_print_error ();

1 0