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

Dmitry Timoshkov : ntdll: Catch the exceptions in the TLS callback like Windows does.
by Alexandre Julliard March 13, 2007

March 13, 2007

Module: wine Branch: master Commit: e8bba26c8062565ff06f68969dd32389f975471a URL: http://source.winehq.org/git/wine.git/?a=commit;h=e8bba26c8062565ff06f68969… Author: Dmitry Timoshkov <dmitry(a)codeweavers.com> Date: Tue Mar 13 18:21:37 2007 +0800 ntdll: Catch the exceptions in the TLS callback like Windows does. --- dlls/ntdll/loader.c | 13 ++++++++++++- 1 files changed, 12 insertions(+), 1 deletions(-) diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c index 7ff3ca1..441db92 100644 --- a/dlls/ntdll/loader.c +++ b/dlls/ntdll/loader.c @@ -798,7 +798,18 @@ static void call_tls_callbacks( HMODULE module, UINT reason ) if (TRACE_ON(relay)) DPRINTF("%04x:Call TLS callback (proc=%p,module=%p,reason=%s,reserved=0)\n", GetCurrentThreadId(), *callback, module, reason_names[reason] ); - (*callback)( module, reason, NULL ); + __TRY + { + (*callback)( module, reason, NULL ); + } + __EXCEPT(NULL) + { + if (TRACE_ON(relay)) + DPRINTF("%04x:exception in TLS callback (proc=%p,module=%p,reason=%s,reserved=0)\n", + GetCurrentThreadId(), callback, module, reason_names[reason] ); + return; + } + __ENDTRY if (TRACE_ON(relay)) DPRINTF("%04x:Ret TLS callback (proc=%p,module=%p,reason=%s,reserved=0)\n", GetCurrentThreadId(), *callback, module, reason_names[reason] );

1 0

Juan Lang : crypt32: Set ppSignerSig to NULL in case caller doesn' t check return value.
by Alexandre Julliard March 13, 2007

March 13, 2007

Module: wine Branch: master Commit: 2f7b91d7be888acc23abe6ac52fb91e3100b3c09 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f7b91d7be888acc23abe6ac5… Author: Juan Lang <juan_lang(a)yahoo.com> Date: Mon Mar 12 21:13:21 2007 -0700 crypt32: Set ppSignerSig to NULL in case caller doesn't check return value. --- dlls/crypt32/main.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/main.c b/dlls/crypt32/main.c index dd9e1fb..f5d68d5 100644 --- a/dlls/crypt32/main.c +++ b/dlls/crypt32/main.c @@ -238,5 +238,7 @@ BOOL WINAPI CryptVerifyMessageSignature(PCRYPT_VERIFY_MESSAGE_PARA pVerifyPara, FIXME("stub: %p, %d, %p, %d, %p, %p, %p\n", pVerifyPara, dwSignerIndex, pbSignedBlob, cbSignedBlob, pbDecoded, pcbDecoded, ppSignerCert); + if (ppSignerCert) + *ppSignerCert = NULL; return FALSE; }

1 0

Juan Lang : user32: Fix a comment.
by Alexandre Julliard March 13, 2007

March 13, 2007

Module: wine Branch: master Commit: 8d31aebc5cb51a6a31984d15c4da9da35aac495c URL: http://source.winehq.org/git/wine.git/?a=commit;h=8d31aebc5cb51a6a31984d15c… Author: Juan Lang <juan_lang(a)yahoo.com> Date: Mon Mar 12 21:10:41 2007 -0700 user32: Fix a comment. --- dlls/user32/sysparams.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/user32/sysparams.c b/dlls/user32/sysparams.c index f64c1bb..caef9a9 100644 --- a/dlls/user32/sysparams.c +++ b/dlls/user32/sysparams.c @@ -2725,7 +2725,7 @@ INT WINAPI GetSystemMetrics( INT index ) return tmMenuFont.tmHeight <= 0 ? 13 : ((tmMenuFont.tmHeight + tmMenuFont.tmExternalLeading + 1) / 2) * 2 - 1; case SM_SLOWMACHINE: - return 0; /* FIXME: Should check the type of processor */ + return 0; /* Never true */ case SM_MIDEASTENABLED: return 0; /* FIXME */ case SM_MOUSEWHEELPRESENT:

1 0

András Kovács : wined3d: Set WINED3DCAPS2_DYNAMICTEXTURES flag.
by Alexandre Julliard March 13, 2007

March 13, 2007

Module: wine Branch: master Commit: dac10f0da82228f33cfb2b125ed6394b2012385d URL: http://source.winehq.org/git/wine.git/?a=commit;h=dac10f0da82228f33cfb2b125… Author: András Kovács <andras(a)debian.sth.sze.hu> Date: Tue Mar 13 03:34:36 2007 +0100 wined3d: Set WINED3DCAPS2_DYNAMICTEXTURES flag. --- dlls/wined3d/directx.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/dlls/wined3d/directx.c b/dlls/wined3d/directx.c index 209e745..1b492d5 100644 --- a/dlls/wined3d/directx.c +++ b/dlls/wined3d/directx.c @@ -1879,7 +1879,8 @@ static HRESULT WINAPI IWineD3DImpl_GetDeviceCaps(IWineD3D *iface, UINT Adapter, *pCaps->Caps = 0; *pCaps->Caps2 = WINED3DCAPS2_CANRENDERWINDOWED | - WINED3DCAPS2_FULLSCREENGAMMA; + WINED3DCAPS2_FULLSCREENGAMMA | + WINED3DCAPS2_DYNAMICTEXTURES; *pCaps->Caps3 = 0; *pCaps->PresentationIntervals = WINED3DPRESENT_INTERVAL_IMMEDIATE;

1 0

Jason Edmeades : cmd.exe: Add DIR /X support.
by Alexandre Julliard March 13, 2007

March 13, 2007

Module: wine Branch: master Commit: ae964c68eb18c6a959022aeaae604d259cc93efd URL: http://source.winehq.org/git/wine.git/?a=commit;h=ae964c68eb18c6a959022aeaa… Author: Jason Edmeades <us(a)edmeades.me.uk> Date: Tue Mar 13 01:09:05 2007 +0000 cmd.exe: Add DIR /X support. --- programs/cmd/directory.c | 36 +++++++++++++++++++++++++----------- 1 files changed, 25 insertions(+), 11 deletions(-) diff --git a/programs/cmd/directory.c b/programs/cmd/directory.c index eec4ba8..d787a29 100644 --- a/programs/cmd/directory.c +++ b/programs/cmd/directory.c @@ -47,6 +47,7 @@ typedef enum _DISPLAYTIME } DISPLAYTIME; static int file_total, dir_total, recurse, wide, bare, max_width, lower; +static int shortname; static ULONGLONG byte_total; static DISPLAYTIME dirTime; @@ -71,10 +72,11 @@ void WCMD_directory (void) { /* Handle args */ paged_mode = (strstr(quals, "/P") != NULL); - recurse = (strstr(quals, "/S") != NULL); - wide = (strstr(quals, "/W") != NULL); - bare = (strstr(quals, "/B") != NULL); - lower = (strstr(quals, "/L") != NULL); + recurse = (strstr(quals, "/S") != NULL); + wide = (strstr(quals, "/W") != NULL); + bare = (strstr(quals, "/B") != NULL); + lower = (strstr(quals, "/L") != NULL); + shortname = (strstr(quals, "/X") != NULL); if ((p = strstr(quals, "/T")) != NULL) { p = p + 2; @@ -94,7 +96,8 @@ void WCMD_directory (void) { } /* Handle conflicting args and initialization */ - if (bare) wide = FALSE; + if (bare || shortname) wide = FALSE; + if (bare) shortname = FALSE; if (wide) { if (GetConsoleScreenBufferInfo(GetStdHandle(STD_OUTPUT_HANDLE), &consoleInfo)) @@ -280,8 +283,13 @@ void WCMD_list_directory (char *search_path, int level) { dir_count++; if (!bare) { - WCMD_output ("%10s %8s <DIR> %s\n", - datestring, timestring, (fd+i)->cFileName); + if (shortname) { + WCMD_output ("%10s %8s <DIR> %-13s%s\n", + datestring, timestring, (fd+i)->cAlternateFileName, (fd+i)->cFileName); + } else { + WCMD_output ("%10s %8s <DIR> %s\n", + datestring, timestring, (fd+i)->cFileName); + } } else { if (!((strcmp((fd+i)->cFileName, ".") == 0) || (strcmp((fd+i)->cFileName, "..") == 0))) { @@ -294,10 +302,16 @@ void WCMD_list_directory (char *search_path, int level) { file_size.u.LowPart = (fd+i)->nFileSizeLow; file_size.u.HighPart = (fd+i)->nFileSizeHigh; byte_count.QuadPart += file_size.QuadPart; - if (!bare) { - WCMD_output ("%10s %8s %10s %s\n", - datestring, timestring, - WCMD_filesize64(file_size.QuadPart), (fd+i)->cFileName); + if (!bare) { + if (shortname) { + WCMD_output ("%10s %8s %10s %-13s%s\n", + datestring, timestring, + WCMD_filesize64(file_size.QuadPart), (fd+i)->cAlternateFileName, (fd+i)->cFileName); + } else { + WCMD_output ("%10s %8s %10s %s\n", + datestring, timestring, + WCMD_filesize64(file_size.QuadPart), (fd+i)->cFileName); + } } else { WCMD_output ("%s%s\n", recurse?real_path:"", (fd+i)->cFileName); }

1 0

Jason Edmeades : cmd.exe: Add DIR /T support.
by Alexandre Julliard March 13, 2007

March 13, 2007

Module: wine Branch: master Commit: 577b8ef2338572076d5e4286a46fcc7bf33a42be URL: http://source.winehq.org/git/wine.git/?a=commit;h=577b8ef2338572076d5e4286a… Author: Jason Edmeades <us(a)edmeades.me.uk> Date: Tue Mar 13 00:12:44 2007 +0000 cmd.exe: Add DIR /T support. --- programs/cmd/directory.c | 35 ++++++++++++++++++++++++++++++++++- 1 files changed, 34 insertions(+), 1 deletions(-) diff --git a/programs/cmd/directory.c b/programs/cmd/directory.c index 32e69e9..eec4ba8 100644 --- a/programs/cmd/directory.c +++ b/programs/cmd/directory.c @@ -39,8 +39,16 @@ extern int echo_mode; extern char quals[MAX_PATH], param1[MAX_PATH], param2[MAX_PATH]; extern DWORD errorlevel; +typedef enum _DISPLAYTIME +{ + Creation = 0, + Access, + Written +} DISPLAYTIME; + static int file_total, dir_total, recurse, wide, bare, max_width, lower; static ULONGLONG byte_total; +static DISPLAYTIME dirTime; /***************************************************************************** * WCMD_directory @@ -55,9 +63,11 @@ void WCMD_directory (void) { int status, paged_mode; ULARGE_INTEGER avail, total, free; CONSOLE_SCREEN_BUFFER_INFO consoleInfo; + char *p; byte_total = 0; file_total = dir_total = 0; + dirTime = Written; /* Handle args */ paged_mode = (strstr(quals, "/P") != NULL); @@ -66,6 +76,23 @@ void WCMD_directory (void) { bare = (strstr(quals, "/B") != NULL); lower = (strstr(quals, "/L") != NULL); + if ((p = strstr(quals, "/T")) != NULL) { + p = p + 2; + if (*p==':') p++; /* Skip optional : */ + + if (*p == 'A') dirTime = Access; + else if (*p == 'C') dirTime = Creation; + else if (*p == 'W') dirTime = Written; + + /* Support /T and /T: with no parms, default to written */ + else if (*p == '/') dirTime = Written; + else { + SetLastError(ERROR_INVALID_PARAMETER); + WCMD_print_error(); + return; + } + } + /* Handle conflicting args and initialization */ if (bare) wide = FALSE; @@ -212,7 +239,13 @@ void WCMD_list_directory (char *search_path, int level) { while ( (*p = tolower(*p)) ) ++p; } - FileTimeToLocalFileTime (&(fd+i)->ftLastWriteTime, &ft); + if (dirTime == Written) { + FileTimeToLocalFileTime (&(fd+i)->ftLastWriteTime, &ft); + } else if (dirTime == Access) { + FileTimeToLocalFileTime (&(fd+i)->ftLastAccessTime, &ft); + } else { + FileTimeToLocalFileTime (&(fd+i)->ftCreationTime, &ft); + } FileTimeToSystemTime (&ft, &st); GetDateFormat (0, DATE_SHORTDATE, &st, NULL, datestring, sizeof(datestring));

1 0

Jason Edmeades : cmd.exe: Add dir /L support.
by Alexandre Julliard March 13, 2007

March 13, 2007

Module: wine Branch: master Commit: 729ed8623b7b9799e76befbf128a21d1a7b8eb3a URL: http://source.winehq.org/git/wine.git/?a=commit;h=729ed8623b7b9799e76befbf1… Author: Jason Edmeades <us(a)edmeades.me.uk> Date: Tue Mar 13 01:08:19 2007 +0000 cmd.exe: Add dir /L support. --- programs/cmd/directory.c | 10 +++++++++- 1 files changed, 9 insertions(+), 1 deletions(-) diff --git a/programs/cmd/directory.c b/programs/cmd/directory.c index ea652f9..32e69e9 100644 --- a/programs/cmd/directory.c +++ b/programs/cmd/directory.c @@ -39,7 +39,7 @@ extern int echo_mode; extern char quals[MAX_PATH], param1[MAX_PATH], param2[MAX_PATH]; extern DWORD errorlevel; -static int file_total, dir_total, recurse, wide, bare, max_width; +static int file_total, dir_total, recurse, wide, bare, max_width, lower; static ULONGLONG byte_total; /***************************************************************************** @@ -64,6 +64,7 @@ void WCMD_directory (void) { recurse = (strstr(quals, "/S") != NULL); wide = (strstr(quals, "/W") != NULL); bare = (strstr(quals, "/B") != NULL); + lower = (strstr(quals, "/L") != NULL); /* Handle conflicting args and initialization */ if (bare) wide = FALSE; @@ -204,6 +205,13 @@ void WCMD_list_directory (char *search_path, int level) { } for (i=0; i<entry_count; i++) { + + /* /L convers all names to lower case */ + if (lower) { + char *p = (fd+i)->cFileName; + while ( (*p = tolower(*p)) ) ++p; + } + FileTimeToLocalFileTime (&(fd+i)->ftLastWriteTime, &ft); FileTimeToSystemTime (&ft, &st); GetDateFormat (0, DATE_SHORTDATE, &st, NULL, datestring,

1 0

Jason Edmeades : cmd.exe: Make SET have correct errorlevel.
by Alexandre Julliard March 13, 2007

March 13, 2007

Module: wine Branch: master Commit: 87f0293657591c2bed80bcf36801a8a2c889b3fc URL: http://source.winehq.org/git/wine.git/?a=commit;h=87f0293657591c2bed80bcf36… Author: Jason Edmeades <us(a)edmeades.me.uk> Date: Tue Mar 13 00:11:31 2007 +0000 cmd.exe: Make SET have correct errorlevel. --- programs/cmd/builtins.c | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 02004ae..4efe580 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -1278,6 +1278,7 @@ void WCMD_setshow_env (char *s) { char *p; int status; + errorlevel = 0; if (param1[0] == 0x00 && quals[0] == 0x00) { env = GetEnvironmentStrings (); WCMD_setshow_sortenv( env, NULL ); @@ -1314,11 +1315,13 @@ void WCMD_setshow_env (char *s) { } } else { + DWORD gle; p = strchr (s, '='); if (p == NULL) { env = GetEnvironmentStrings (); if (WCMD_setshow_sortenv( env, s ) == 0) { WCMD_output ("Environment variable %s not defined\n", s); + errorlevel = 1; } return; } @@ -1326,7 +1329,10 @@ void WCMD_setshow_env (char *s) { if (strlen(p) == 0) p = NULL; status = SetEnvironmentVariable (s, p); - if ((!status) & (GetLastError() != ERROR_ENVVAR_NOT_FOUND)) WCMD_print_error(); + gle = GetLastError(); + if ((!status) & (gle == ERROR_ENVVAR_NOT_FOUND)) { + errorlevel = 1; + } else if ((!status)) WCMD_print_error(); } }

1 0

Jason Edmeades : cmd.exe: Add SET /P support.
by Alexandre Julliard March 13, 2007

March 13, 2007

Module: wine Branch: master Commit: 4b1ef917bc1bec43749f4d7a576567ad33b537a2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b1ef917bc1bec43749f4d7a5… Author: Jason Edmeades <us(a)edmeades.me.uk> Date: Tue Mar 13 00:11:04 2007 +0000 cmd.exe: Add SET /P support. --- programs/cmd/builtins.c | 35 +++++++++++++++++++++++++++++++++-- 1 files changed, 33 insertions(+), 2 deletions(-) diff --git a/programs/cmd/builtins.c b/programs/cmd/builtins.c index 8359152..02004ae 100644 --- a/programs/cmd/builtins.c +++ b/programs/cmd/builtins.c @@ -1278,11 +1278,42 @@ void WCMD_setshow_env (char *s) { char *p; int status; - if (strlen(param1) == 0) { + if (param1[0] == 0x00 && quals[0] == 0x00) { env = GetEnvironmentStrings (); WCMD_setshow_sortenv( env, NULL ); + return; } - else { + + /* See if /P supplied, and if so echo the prompt, and read in a reply */ + if (CompareString (LOCALE_USER_DEFAULT, + NORM_IGNORECASE | SORT_STRINGSORT, + s, 2, "/P", -1) == 2) { + char string[MAXSTRING]; + DWORD count; + + s += 2; + while (*s && *s==' ') s++; + + /* If no parameter, or no '=' sign, return an error */ + if (!(*s) || ((p = strchr (s, '=')) == NULL )) { + WCMD_output ("Argument missing\n"); + return; + } + + /* Output the prompt */ + *p++ = '\0'; + if (strlen(p) != 0) WCMD_output(p); + + /* Read the reply */ + ReadFile (GetStdHandle(STD_INPUT_HANDLE), string, sizeof(string), &count, NULL); + if (count > 1) { + string[count-1] = '\0'; /* ReadFile output is not null-terminated! */ + if (string[count-2] == '\r') string[count-2] = '\0'; /* Under Windoze we get CRLF! */ + WINE_TRACE("set /p: Setting var '%s' to '%s'\n", s, string); + status = SetEnvironmentVariable (s, string); + } + + } else { p = strchr (s, '='); if (p == NULL) { env = GetEnvironmentStrings ();

1 0

Jason Edmeades : cmd.exe: Add 2>&1 and 1>&2 support.
by Alexandre Julliard March 13, 2007

March 13, 2007

Module: wine Branch: master Commit: a801995cdbe4976785762e431b9d0648696ff46a URL: http://source.winehq.org/git/wine.git/?a=commit;h=a801995cdbe4976785762e431… Author: Jason Edmeades <us(a)edmeades.me.uk> Date: Tue Mar 13 00:10:38 2007 +0000 cmd.exe: Add 2>&1 and 1>&2 support. --- programs/cmd/wcmdmain.c | 39 +++++++++++++++++++++++++++++---------- 1 files changed, 29 insertions(+), 10 deletions(-) diff --git a/programs/cmd/wcmdmain.c b/programs/cmd/wcmdmain.c index 037efcc..1bb9154 100644 --- a/programs/cmd/wcmdmain.c +++ b/programs/cmd/wcmdmain.c @@ -533,18 +533,37 @@ void WCMD_process_command (char *command) else { creationDisposition = CREATE_ALWAYS; } + + /* Add support for 2>&1 */ redir = p; - h = CreateFile (WCMD_parameter (p, 0, NULL), GENERIC_WRITE, 0, &sa, creationDisposition, - FILE_ATTRIBUTE_NORMAL, NULL); - if (h == INVALID_HANDLE_VALUE) { - WCMD_print_error (); - HeapFree( GetProcessHeap(), 0, cmd ); - return; - } - if (SetFilePointer (h, 0, NULL, FILE_END) == - INVALID_SET_FILE_POINTER) { - WCMD_print_error (); + if (*p == '&') { + int idx = *(p+1) - '0'; + + if (DuplicateHandle(GetCurrentProcess(), + GetStdHandle(idx_stdhandles[idx]), + GetCurrentProcess(), + &h, + 0, TRUE, DUPLICATE_SAME_ACCESS) == 0) { + WINE_FIXME("Duplicating handle failed with gle %d\n", GetLastError()); + } + WINE_TRACE("Redirect %d (%p) to %d (%p)\n", handle, GetStdHandle(idx_stdhandles[idx]), idx, h); + + } else { + char *param = WCMD_parameter (p, 0, NULL); + h = CreateFile (param, GENERIC_WRITE, 0, &sa, creationDisposition, + FILE_ATTRIBUTE_NORMAL, NULL); + if (h == INVALID_HANDLE_VALUE) { + WCMD_print_error (); + HeapFree( GetProcessHeap(), 0, cmd ); + return; + } + if (SetFilePointer (h, 0, NULL, FILE_END) == + INVALID_SET_FILE_POINTER) { + WCMD_print_error (); + } + WINE_TRACE("Redirect %d to '%s' (%p)\n", handle, param, h); } + old_stdhandles[handle] = GetStdHandle (idx_stdhandles[handle]); SetStdHandle (idx_stdhandles[handle], h); }

1 0