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

Re: [2/3] wined3d: The texldl instruction takes 3 arguments
by Ivan Gyurdiev 03 Mar '07

03 Mar '07

> Changelog: > - The texldl instruction takes 3 arguments > Can the SW shader handlers be deleted now that the rest of the SW code is gone. They just get out of sync when you do things like this.

2 1

Re: [programs/cacls] Dummy implementation of cacls.exe (try 2)
by Nigel "Nia-Chiang" Liang 02 Mar '07

02 Mar '07

Yes, sorry about that. Here is the modified patch -Nigel On 3/2/07, James Hawkins <truiken(a)gmail.com> wrote: > > On 3/2/07, Nigel Nia-Chiang Liang <ncliang(a)gmail.com> wrote: > > Hi, > > > > This patch implements a dummy version of cacls.exe to fix bug 7593. > > > > +#RC_SRCS = wcmdrc.rc > +#RC_BINSRC = wcmdrc.rc > +#RC_BINARIES = wcmd.ico > > Did you accidentally leave these in? > > -- > James Hawkins >

1 0

Re: Forum proposal
by Tomas Carnecky 02 Mar '07

02 Mar '07

Luis C. Busquets Pérez wrote: > I understand that for some people the mailing list is a far better > thing. May be for some other, a forum is better. > > Why not trying both systems? > This question has already been answered.. anyway: if you have both a ML and a forum, you effectively split the community into two parts! Nobody will be on both the forum and the ML, it will be harder for the users because they'll have to two places to go to, and it will be harder for the developers because bug-reports will be posted two two different places. tom

6 9

Re: [programs/cacls] Dummy implementation of cacls.exe
by James Hawkins 02 Mar '07

02 Mar '07

On 3/2/07, Nigel Nia-Chiang Liang <ncliang(a)gmail.com> wrote: > Hi, > > This patch implements a dummy version of cacls.exe to fix bug 7593. > +#RC_SRCS = wcmdrc.rc +#RC_BINSRC = wcmdrc.rc +#RC_BINARIES = wcmd.ico Did you accidentally leave these in? -- James Hawkins

1 0

Re: kernel32: Implement ReplaceFileA/ReplaceFileW
by Felix Nawothnig 02 Mar '07

02 Mar '07

(CC-ing wine-devel again) Erich Hoover wrote: >> The "right" way would probably to do the copying yourself by >> read/write.. but I dunno. > Except that it would ignore the permissions issues that have already > been coded into the copy routines (and any updates that may eventually No, CreateFile (and friends) does the permissions checks (which you would still have to call). > be made to these routines). Also, it seems to me that MSDN is > describing the list of function calls that ReplaceFile actually makes. No it doesn't? Your other objections were right. Your last version follows for wine-devel. > ------------------------------------------------------------------------ > > /************************************************************************** > * ReplaceFileW (KERNEL32.@) > * ReplaceFile (KERNEL32.@) > */ > BOOL WINAPI ReplaceFileW(LPCWSTR lpReplacedFileName,LPCWSTR lpReplacementFileName, > LPCWSTR lpBackupFileName, DWORD dwReplaceFlags, > LPVOID lpExclude, LPVOID lpReserved) > { > HANDLE hReplaced, hReplacement; > BOOL skipBackup = FALSE; > > if(dwReplaceFlags) > FIXME("Ignoring flags %x\n", dwReplaceFlags); > /* First two arguments are mandatory */ > if(!lpReplacedFileName || !lpReplacementFileName) > { > SetLastError( ERROR_INVALID_PARAMETER ); > return FALSE; > } > /* > * Lock the "replacement" file, fail if it does not exist > */ > if((hReplacement = CreateFileW(lpReplacementFileName, GENERIC_READ, > FILE_SHARE_READ | FILE_SHARE_WRITE | FILE_SHARE_DELETE, > NULL, OPEN_EXISTING, 0, 0)) == INVALID_HANDLE_VALUE) > { > return FALSE; > } > if(!LockFile( hReplacement, 0, 0, 0, 0 )) > { > CloseHandle( hReplacement ); > return FALSE; > } > /* > * Lock the "replaced" file while we're working. > */ > if((hReplaced = CreateFileW(lpReplacedFileName, GENERIC_READ, > FILE_SHARE_READ | FILE_SHARE_WRITE, > NULL, OPEN_EXISTING, 0, 0)) == INVALID_HANDLE_VALUE) > { > /* If "replaced" does not exist then create it for the lock, but skip backup */ > if((hReplaced = CreateFileW(lpReplacedFileName, GENERIC_READ, > FILE_SHARE_READ | FILE_SHARE_WRITE, > NULL, CREATE_ALWAYS, 0, 0)) == INVALID_HANDLE_VALUE) > { > UnlockFile( hReplacement, 0, 0, 0, 0 ); > CloseHandle( hReplacement ); > return FALSE; > } > skipBackup = TRUE; > } > if(!LockFile( hReplaced, 0, 0, 0, 0 )) > { > UnlockFile( hReplacement, 0, 0, 0, 0 ); > CloseHandle( hReplacement ); > CloseHandle( hReplaced ); > return FALSE; > } > /* > * If the user wants a backup then that needs to be performed first > */ > if( lpBackupFileName && !skipBackup ) > { > /* If an existing backup exists then copy over it */ > if(!CopyFileW( lpReplacedFileName, lpBackupFileName, FALSE )) > goto replace_fail; > } > /* > * Now that the backup has been performed (if requested), copy the replacement > * into place > */ > if(!CopyFileW( lpReplacementFileName, lpReplacedFileName, FALSE )) > { > /* Assume that all access denied errors are a write problem. */ > if(GetLastError() == ERROR_ACCESS_DENIED) > SetLastError( ERROR_UNABLE_TO_REMOVE_REPLACED ); > else > SetLastError( ERROR_UNABLE_TO_MOVE_REPLACEMENT ); > goto replace_fail; > } > /* Delete the replacement file */ > if(!DeleteFileW( lpReplacementFileName )) > return FALSE; > /* Unlock the handles */ > UnlockFile( hReplacement, 0, 0, 0, 0 ); > CloseHandle( hReplacement ); > UnlockFile( hReplaced, 0, 0, 0, 0 ); > CloseHandle( hReplaced ); > /* All done, file replacement successful */ > return TRUE; > > replace_fail: > UnlockFile( hReplacement, 0, 0, 0, 0 ); > CloseHandle( hReplacement ); > UnlockFile( hReplaced, 0, 0, 0, 0 ); > CloseHandle( hReplaced ); > return FALSE; > }

2 4

Re: ntdll: make exception test not hang when creating process fails
by Robert Shearman 02 Mar '07

02 Mar '07

Peter Oberndorfer wrote: > --- > Did not seem to happen in the wild, > but just make sure the test fails gracefully > if launching the child fails > > Applies on top of the patch which should fix test result reporting > If it doesn't happen in the wild, then it should stay as an "ok". -- Rob Shearman

1 0

Re: kernel32: Set object security on process object in CreateProcess.[try2]
by Vitaliy Margolen 02 Mar '07

02 Mar '07

Vitaliy Margolen wrote: > Removed todo from succeeding tests. > > Tests showed that only DACL can be set this way. Owner and group > are taken from the token. And we don't need SACL at this time if ever. > --- > dlls/advapi32/tests/security.c | 3 --- > dlls/kernel32/process.c | 12 ++++++++++++ > 2 files changed, 12 insertions(+), 3 deletions(-) Any reason this patch was not applied? Vitaliy.

2 1

[TOOLS/RFC] Use skip information on test.winehq.org
by Paul Vriens 02 Mar '07

02 Mar '07

Hi, This patch add the skip information to test.winehq.org. I'm not a 100% sure what will happen to the already existing reports when summary.js is patched. This however is only relevant for someone opening the popup window for old reports. There could be an issue when somebody is running an old(er) winetest version and sends the results to test.winehq.org. The summary.txt will be different for the later added ones compared to the ones that are already there. Should I change the fileversion (from 3 to 4)? In that case only new type winetest reports will be accepted by test.winehq.org. Any other remarks and/or suggestions? Changelog Use skip information Cheers, Paul. Index: winetest/dissect =================================================================== RCS file: /home/wine/tools/winetest/dissect,v retrieving revision 1.21 diff -u -p -r1.21 dissect --- winetest/dissect 1 Mar 2007 18:30:28 -0000 1.21 +++ winetest/dissect 2 Mar 2007 10:10:21 -0000 @@ -143,9 +143,9 @@ if ($wine) { /Test output:\r?/ or mydie "no test header: $_"; my ($unit, $test, $source, $rev, $result); -my ($lines,$total, $todo, $failed); +my ($lines,$total, $todo, $failed, $skipped); $unit = undef; # state machine starts -$total = $todo = $failed = 0; +$total = $todo = $failed = $skipped = 0; $lines = 0; while (<IN>) { if (!defined $unit) { # new test @@ -165,13 +165,14 @@ while (<IN>) { $total += $2; $todo += $3; $failed += $4; + $skipped += $5; print OUT; } elsif (s/$unit:$test done $(-?\d+)$\r?$//) { chomp; # current test ended if ($lines==0) { - $result = "failed $1 -"; + $result = "failed $1 - -"; } else { - $result = "$total $todo $failed"; + $result = "$total $todo $failed $skipped"; } FINISH: print SUM "- $unit $test $result $source $rev\n"; @@ -183,7 +184,7 @@ while (<IN>) { mydie "can't rename $tmpfile to $testfile: $!\n"; } $unit = undef; - $total = $todo = $failed = 0; + $total = $todo = $failed = $skipped = 0; $lines = 0; } else { # current test output print OUT; @@ -191,7 +192,7 @@ while (<IN>) { } if (defined $unit) { $_=""; - $result = "failed - -"; + $result = "failed - - -"; goto FINISH; } close SUM or mydie "error writing $tmpdir/summary.txt: $!"; Index: winetest/gather =================================================================== RCS file: /home/wine/tools/winetest/gather,v retrieving revision 1.17 diff -u -p -r1.17 gather --- winetest/gather 11 Jan 2007 17:03:43 -0000 1.17 +++ winetest/gather 2 Mar 2007 10:10:21 -0000 @@ -94,10 +94,10 @@ foreach my $file (glob "$datadir/$build/ next; } while (<TEST>) { - my ($digest, $unit, $test, $count, $todo, $error, + my ($digest, $unit, $test, $count, $todo, $error, $skipped, $source, $rev) = split; my $testname = "$unit:$test"; - $testref->{results}->{$testname} = [$count, $todo, $error]; + $testref->{results}->{$testname} = [$count, $todo, $error, $skipped]; $alltests{$testname} = "http://cvs.winehq.org/cvsweb/wine/$source" . ($rev ne "-"?"#rev$rev":"") unless exists $alltests{$testname}; if ($count ne "failed") { @@ -215,7 +215,7 @@ sub singletest { print OUT " <td class=\"${vis}note\">.</td>\n"; } else { my $file = "$test->{dir}/$testname.txt"; - my ($count, $todo, $error) = @{$test->{results}->{$testname}}; + my ($count, $todo, $error, $skipped) = @{$test->{results}->{$testname}}; if ($count eq "failed") { my $msg = $todo eq "-"?"crash": $todo == 258?"timeout":"failed"; @@ -226,8 +226,8 @@ sub singletest { print OUT <<"EOF"; <td class="$vis$class"><a href="$file" - title="$count tests, $todo TODO, $error errors" - onMouseOver="refresh('$testname','$groupname $test->{tag}',$count,$todo,$error);" + title="$count tests, $todo TODO, $error errors, $skipped skipped" + onMouseOver="refresh('$testname','$groupname $test->{tag}',$count,$todo,$error,$skipped);" >$error</a></td> EOF } Index: winetest/resultform.html =================================================================== RCS file: /home/wine/tools/winetest/resultform.html,v retrieving revision 1.1 diff -u -p -r1.1 resultform.html --- winetest/resultform.html 19 Feb 2004 22:00:34 -0000 1.1 +++ winetest/resultform.html 2 Mar 2007 10:10:21 -0000 @@ -34,6 +34,10 @@ <td>Errors:</td> <td><input type="text" name="errors" size="6" readonly></td> </tr> + <tr> + <td>Skipped:</td> + <td><input type="text" name="skipped" size="6" readonly></td> + </tr> </form> </body> </html> Index: winetest/summary.js =================================================================== RCS file: /home/wine/tools/winetest/summary.js,v retrieving revision 1.2 diff -u -p -r1.2 summary.js --- winetest/summary.js 11 Jan 2005 16:00:44 -0000 1.2 +++ winetest/summary.js 2 Mar 2007 10:10:22 -0000 @@ -9,7 +9,7 @@ function isopen () { return result_window && result_window.document && result_window.document.results; } -function refresh (test, version, tests, todo, errors) { +function refresh (test, version, tests, todo, errors, skipped) { if (isopen ()) { var form = result_window.document.results; form.test.value = test; @@ -17,6 +17,7 @@ function refresh (test, version, tests, form.tests.value = tests; form.todo.value = todo; form.errors.value = errors; + form.skipped.value = skipped; result_window.focus (); } } @@ -31,5 +32,6 @@ function clone () { cf.tests.value = rf.tests.value; cf.todo.value = rf.todo.value; cf.errors.value = rf.errors.value; + cf.skipped.value = rf.skipped.value; } }

1 0

Re: kernel32: Fix GetComputerNameA to not count trailing NULL
by Dmitry Timoshkov 02 Mar '07

02 Mar '07

"Alasdair Sinclair" <alasdairs(a)dsl.pipex.com> wrote: > GetComputerNameA shouldn't count the trailing NULL when returning the > buffer. > --- a/dlls/kernel32/computername.c > +++ b/dlls/kernel32/computername.c > @@ -390,8 +390,7 @@ BOOL WINAPI GetComputerNameA(LPSTR name, LPDWORD size) > else > { > WideCharToMultiByte ( CP_ACP, 0, nameW, -1, name, len, NULL, 0 ); > - name[len] = 0; > - *size = len; > + *size = len - 1; > ret = TRUE; This change requires a test case. -- Dmitry.

1 0

Re: [try3, 4/4] msi: Add full JScript/VBScript support.
by James Hawkins 02 Mar '07

02 Mar '07

On 3/1/07, Misha Koshelev <mk144210(a)bcm.tmc.edu> wrote: > No changes from previous version. > > Implements the IActiveScriptSite interface which links with the session > object implemented in patch #3 and then adds a call to the script > handler from the common script handling function implemented in patch > #1. This fixes bug #7357 and possibly others. > > Changelog: > > * msi: Add full JScript/VBScript support. > +static HRESULT ASS_create(IUnknown *pUnkOuter, LPVOID *ppObj) +{ I'm not trying to be immature, but you should probably come up with a better prefix. + * Call a script. This is our meat and potatoes. + * - Currently, since the function is relatively new, it will always end up returning S_OK. + * Think of it like a bonus feature, we can run the script - great. If we have a problem, + * we are no worse off than if this function had not been called. + */ +DWORD call_script(MSIHANDLE hPackage, INT type, LPCWSTR script, LPCWSTR function, LPCWSTR action) +{ ... +/* return ret; */ + return ERROR_SUCCESS; /* FIXME: Until thoroughly tested, always return success */ This is wrong...and a hack. Don't be afraid of bugs. By always returning ERROR_SUCCESS, you're just hiding the bugs. What testing are you referring to? If a user runs an installer and the script fails, yet we return ERROR_SUCCESS, how are we going to know that the script is the problem? +static HRESULT WINAPI MsiActiveScriptSite_GetLCID(IActiveScriptSite* iface, LCID* plcid) +{ + MsiActiveScriptSite *This = (MsiActiveScriptSite *)iface; + TRACE("(%p/%p)->(%p) stub!\n", This, iface, plcid); + return E_NOTIMPL; +} If it's a stub, it needs to be marked with a FIXME. -- James Hawkins

2 3