January 2017 - Wine-Devel - list.winehq.org

Post-release
by Alexandre Julliard Jan. 25, 2017

Jan. 25, 2017

Congrats to everybody for the 2.0 release! I'm particularly pleased with the progress we've made on fixing regressions, I didn't expect we'd get that many. Thanks all! The master branch is now open for development again. I'll go through the patches that are still in the queue, but please resend any patch that had been marked Deferred. I'll also resume the biweekly development release cycle, starting with release 2.1 on February 3rd. Despite fierce competition, Michael Stefaniuc once again took the coveted job of Stable Branch Maintainer. He'll be making regular 2.0.x releases. I've also implemented the patch reviewer assignment scheme that we discussed at WineConf. From now on, patches that stay in the queue unreviewed for a week will be assigned a reviewer automatically. The algorithm is prioritizing people who said they have some knowledge about the area (the P: entries in the MAINTAINERS file), before grabbing someone at random from the wildcard entry. If you feel that there are areas where you could help reviewing patches, but don't feel comfortable putting yourself up as maintainer, please consider adding an entry for yourself as a knowledgeable person. If you are asked to review a patch, and you think it looks good but don't feel that you know enough to sign off on it, please just send a reply saying "looks OK to me" or something like that. I may then ask someone else to have a further look, or do it myself. Any review helps, even without a full signoff. Looking forward to 3.0 :-) -- Alexandre Julliard julliard(a)winehq.org

1 0

Re: rstrtmgr: add RmShutdown stub (resend)
by Sebastian Lackner Jan. 25, 2017

Jan. 25, 2017

On 25.01.2017 06:28, Austin English wrote: > CC: Sebastian Lackner <sebastian(a)fds-team.de> > > Supersedes https://source.winehq.org/patches/data/128639 > > Fixes https://bugs.winehq.org/show_bug.cgi?id=42093 > > Staged, https://github.com/wine-compholio/wine-staging/commit/b013afa66065427110c02… > > -- -Austin GPG: 14FB D7EA A041 937B > > > 0001-rstrtmgr-add-RmShutdown-stub-resend.patch > > > From fab99f2f9e398978461af053b38aa9b06b7bdc1d Mon Sep 17 00:00:00 2001 > From: Austin English <austinenglish(a)gmail.com> > Date: Wed, 28 Dec 2016 02:18:13 -0600 > Subject: [PATCH] rstrtmgr: add RmShutdown stub (resend) > > Signed-off-by: Austin English <austinenglish(a)gmail.com> > --- > dlls/rstrtmgr/main.c | 9 +++++++++ > dlls/rstrtmgr/rstrtmgr.spec | 2 +- > include/restartmanager.h | 3 +++ > 3 files changed, 13 insertions(+), 1 deletion(-) > > diff --git a/dlls/rstrtmgr/main.c b/dlls/rstrtmgr/main.c > index 2d45639..5c9a8dc 100644 > --- a/dlls/rstrtmgr/main.c > +++ b/dlls/rstrtmgr/main.c > @@ -100,3 +100,12 @@ DWORD WINAPI RmEndSession(DWORD handle) > FIXME("%u stub!\n", handle); > return ERROR_CALL_NOT_IMPLEMENTED; > } > + > +/*********************************************************************** > + * RmShutdown (rstrtmgr.@) > + */ > +DWORD WINAPI RmShutdown(DWORD handle, ULONG flags, RM_WRITE_STATUS_CALLBACK status) > +{ > + FIXME("%u, 0x%08x, %p stub!\n", handle, flags, status); > + return ERROR_CALL_NOT_IMPLEMENTED; > +} > diff --git a/dlls/rstrtmgr/rstrtmgr.spec b/dlls/rstrtmgr/rstrtmgr.spec > index 0e1ba79..6c6a9c9 100644 > --- a/dlls/rstrtmgr/rstrtmgr.spec > +++ b/dlls/rstrtmgr/rstrtmgr.spec > @@ -8,5 +8,5 @@ > @ stub RmRemoveFilter > @ stub RmReserveHeap > @ stdcall RmRestart(long long ptr) > -@ stub RmShutdown > +@ stdcall RmShutdown(long long ptr) > @ stdcall RmStartSession(ptr long ptr) > diff --git a/include/restartmanager.h b/include/restartmanager.h > index 27c1a92..51867a3 100644 > --- a/include/restartmanager.h > +++ b/include/restartmanager.h > @@ -64,6 +64,9 @@ typedef struct { > BOOL bRestartable; > } RM_PROCESS_INFO, *PRM_PROCESS_INFO; > > + > +typedef void *RM_WRITE_STATUS_CALLBACK(UINT); The calling convention is missing here, please see the staged version how it should look like. > + > #ifdef __cplusplus > } > #endif > -- 2.10.2 >

1 0

Re: [resend 2/3] ntdll: Implement FileIdInformation class support in NtQueryInformationFile.
by Sebastian Lackner Jan. 25, 2017

Jan. 25, 2017

On 25.01.2017 04:57, Jonathan Doron wrote: > + ((PLARGE_INTEGER)&info->VolumeSerialNumber)->LowPart = (ULONG)volstats.f_fsid.__val[0]; > + ((PLARGE_INTEGER)&info->VolumeSerialNumber)->HighPart = (ULONG)volstats.f_fsid.__val[1]; Accessing members of f_fsid is not cross-platform compatible - you will either have to find a better way to get this information, or at least add corresponding checks to configure.ac. For more information see: https://linux.die.net/man/2/fstatfs """Nobody knows what f_fsid is supposed to contain (but see below).""" """Solaris, Irix and POSIX have a system call statvfs(2) that returns a struct statvfs (defined in <sys/statvfs.h>) containing an unsigned long f_fsid. Linux, SunOS, HP-UX, 4.4BSD have a system call statfs() that returns a struct statfs (defined in <sys/vfs.h>) containing a fsid_t f_fsid, where fsid_t is defined as struct { int val[2]; }."""

1 0

Re: [PATCH resend] user32: Also remove WM_CHAR from queue when a menu gets VK_ESCAPE and add tests
by Dmitry Timoshkov Jan. 25, 2017

Jan. 25, 2017

Fabian Maurer <dark.shadow4(a)web.de> wrote: > +/* Test handling of VK_ESCAPE to close the menu */ > +static LRESULT WINAPI esc_test_wnd_proc(HWND hwnd, UINT msg, WPARAM wparam, LPARAM lparam) > +{ > + if(msg == WM_SHOWWINDOW) > + { > + PostMessageW(hwnd, WM_KEYDOWN, VK_ESCAPE, 0); > + HMENU hPopupMenu = CreatePopupMenu(); > + InsertMenuA(hPopupMenu, 0, MF_STRING, 10, "test"); > + TrackPopupMenu(hPopupMenu, 0, 0, 0, 0, hwnd, NULL); > + PostQuitMessage(0); > + } > + > + if(msg == WM_CHAR || msg == WM_KEYDOWN) > + ok(0, "Wrong VK_ESCAPE press detected.\n"); > + > + return DefWindowProcA(hwnd, msg, wparam, lparam); > +} Please add a test to msg.c instead. This should be a normal TrackPopupMenu test not wrapped inside of a parent's WM_SHOWWINDOW message handler. Once there is a message test, and the underlying behaviour is well understood a patch with a fix could be sent separately. -- Dmitry.

1 0

Re: [PATCH] gdi32: Add traces for painting functions
by Huw Davies Jan. 25, 2017

Jan. 25, 2017

On Sat, Jan 21, 2017 at 06:45:31PM +0100, Fabian Maurer wrote: > Signed-off-by: Fabian Maurer <dark.shadow4(a)web.de> > --- > dlls/gdi32/painting.c | 56 +++++++++++++++++++++++++++++++++++++++++++++++---- > 1 file changed, 52 insertions(+), 4 deletions(-) I would suggest printing the point-like terms in the same way as wine_dbgstr_point() and the rect-like terms in the same way as wine_dbgstr_rect(). > @@ -237,6 +237,8 @@ BOOL WINAPI LineTo( HDC hdc, INT x, INT y ) > PHYSDEV physdev; > BOOL ret; > > + TRACE( "%p, %d, %d\n", hdc, x, y ); So this would be: TRACE( "%p, (%d,%d)\n", hdc, x, y ); > @@ -288,6 +292,8 @@ BOOL WINAPI Arc( HDC hdc, INT left, INT top, INT right, > BOOL ret; > DC * dc = get_dc_ptr( hdc ); > > + TRACE( "%p, %d, %d, %d, %d, %d, %d, %d, %d\n", hdc, left, top, right, bottom, xstart, ystart, xend, yend ); And this would be: TRACE( "%p, (%d,%d)-(%d,%d), (%d,%d), (%d,%d)\n", hdc, left, top, right, bottom, xstart, ystart, xend, yend ); > @@ -421,6 +437,8 @@ BOOL WINAPI RoundRect( HDC hdc, INT left, INT top, INT right, > BOOL ret; > DC *dc = get_dc_ptr( hdc ); > > + TRACE( "%p, %d, %d, %d, %d, %d, %d\n", hdc, left, top, right, bottom, ell_width, ell_height ); A size-like term could be: TRACE( "%p, (%d,%d)-(%d,%d), %dx%d\n", hdc, left, top, right, bottom, ell_width, ell_height ); > @@ -702,6 +738,8 @@ BOOL WINAPI ExtFloodFill( HDC hdc, INT x, INT y, COLORREF color, > BOOL ret; > DC * dc = get_dc_ptr( hdc ); > > + TRACE( "%p, %d, %d, %x, %x\n", hdc, x, y, color, fillType ); color should be %08x Huw.

2 1

Code freeze
by Fabian Maurer Jan. 25, 2017

Jan. 25, 2017

Hello, Now that wine 2.0 is released, does this mark the end of code-freeze or should we still wait before sending in patches like normally? Regards, Fabian

2 1

Re: [PATCH] shell32: Implement knownfolder_GetRedirectionCapabilities somewhat
by Nikolay Sivov Jan. 24, 2017

Jan. 24, 2017

On 23.01.2017 23:10, Enrico Horn wrote: > This is the one thing missing to get the config app for Temple+, a > Temple of Elemental Evil Mod, starting. > --- > dlls/shell32/shellpath.c | 5 +++-- > 1 file changed, 3 insertions(+), 2 deletions(-) > > diff --git a/dlls/shell32/shellpath.c b/dlls/shell32/shellpath.c > index 92306239db7..3c44ecb393a 100644 > --- a/dlls/shell32/shellpath.c > +++ b/dlls/shell32/shellpath.c > @@ -5396,8 +5396,9 @@ static HRESULT WINAPI knownfolder_GetRedirectionCapabilities( > IKnownFolder *iface, > KF_REDIRECTION_CAPABILITIES *pCapabilities) > { > - FIXME("%p\n", pCapabilities); > - return E_NOTIMPL; > + FIXME("%p - always denied\n", pCapabilities); > + *pCapabilities = KF_REDIRECTION_CAPABILITIES_DENY_ALL; > + return S_OK; > } > > static HRESULT WINAPI knownfolder_GetFolderDefinition( > Do we have an open bug for that? If it's just a matter of returning static data, it's trivial to fix without any hacks.

2 1

RFC: Flushing the test reports
by Francois Gouget Jan. 24, 2017

Jan. 24, 2017

When a test causes Windows to crash the test output is often lost, even if it was redirected to a file : said file is often either 0-byte long or is missing a huge chunk. This is particularly annoying when the crash happens as part of WineTest as then one has to manually run a bunch of tests to try and find which one caused the issue. And it's not always which test caused the crash as shown by the rasapi32:rasapi case (bug 42185). So I have tested a couple of approaches to better pinpoint which test is causing trouble, and possibly even which chunk of code in that test causes the crash. The first approach is simple: flush the WineTest report to disk between each test (in Unix terms sync). It has little impact on performance and in case of a crash the last 'dll:test start' line would clearly identify the test responsible. diff --git a/programs/winetest/main.c b/programs/winetest/main.c index 50ebf4fd52a..df527734bb8 100644 --- a/programs/winetest/main.c +++ b/programs/winetest/main.c @@ -626,6 +626,11 @@ run_ex (char *cmd, HANDLE out_file, const char *tempdir, DWORD ms) PROCESS_INFORMATION pi; DWORD wait, status; + /* Flush to disk so we know which test caused Windows to crash if it does */ + if (out_file) + FlushFileBuffers(out_file); + FlushFileBuffers(GetStdHandle( STD_ERROR_HANDLE )); + GetStartupInfoA (&si); si.dwFlags = STARTF_USESTDHANDLES; si.hStdInput = GetStdHandle( STD_INPUT_HANDLE ); (the second flush is so WineTest's output too is flushed to disk in case stdout is redirected to a file though I did not really check that this part works) Another approach is to add these calls in wine/test.h. This narrows the location of the Windows crash down to an ok()/trace() interval, even more narrow if WINETEST_REPORT_SUCCESS is set. However this has quite an impact on performance: * WineTest normally takes about 19 minutes. * With the extra flushing this goes up to 29 minutes. * With no flushing but report success I get 45 minutes. * With both flushing and report success this shoots up to 315+ minutes. The report success cases can be ignored but even in the normal case the extra 10 minutes are probably not acceptable. So I set the flushing code behind a $WINETEST_FLUSH check. So once you've identified that, for instance, rasapi32:rasapi is causing trouble, you can run it on its own with report success and flushing to pinpoint where it goes wrong. Of course on the TestBot you still won't get the report (until the TestBot is changed appropriately), and you'll have to contend with the 2 minutes timeout but even with those options 88% of the tests completed within the time limit on my machine. That approach could be done with the patch below. commit ef211f6480fe84fd7660314c27bcaa5630dd0c16 Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Sun Jan 22 02:57:23 2017 +0100 tests: Flush after each message if WINETEST_FLUSH is set. Signed-off-by: Francois Gouget <fgouget(a)codeweavers.com> diff --git a/include/wine/test.h b/include/wine/test.h index aa89c55ca07..149b0a9ae14 100644 --- a/include/wine/test.h +++ b/include/wine/test.h @@ -52,6 +52,9 @@ extern int winetest_debug; /* running in interactive mode? */ extern int winetest_interactive; +/* flush after each trace */ +extern int winetest_flush; + /* current platform */ extern const char *winetest_platform; @@ -199,6 +202,9 @@ int winetest_debug = 1; /* interactive mode? */ int winetest_interactive = 0; +/* flush to disk after every message? */ +int winetest_flush = 0; + /* current platform */ const char *winetest_platform = "windows"; @@ -291,6 +297,11 @@ int broken( int condition ) { return (strcmp(winetest_platform, "windows") == 0) && condition; } +static void winetest_do_flush( void ) +{ + if (winetest_flush) + FlushFileBuffers(GetStdHandle( STD_ERROR_HANDLE )); +} /* * Checks condition. @@ -313,6 +324,7 @@ int winetest_vok( int condition, const char *msg, __winetest_va_list args ) printf( "%s:%d: Test succeeded inside todo block: ", data->current_file, data->current_line ); vprintf(msg, args); + winetest_do_flush(); InterlockedIncrement(&todo_failures); return 0; } @@ -323,6 +335,7 @@ int winetest_vok( int condition, const char *msg, __winetest_va_list args ) printf( "%s:%d: Test marked todo: ", data->current_file, data->current_line ); vprintf(msg, args); + winetest_do_flush(); } InterlockedIncrement(&todo_successes); return 1; @@ -335,14 +348,18 @@ int winetest_vok( int condition, const char *msg, __winetest_va_list args ) printf( "%s:%d: Test failed: ", data->current_file, data->current_line ); vprintf(msg, args); + winetest_do_flush(); InterlockedIncrement(&failures); return 0; } else { if (report_success) + { printf( "%s:%d: Test succeeded\n", data->current_file, data->current_line); + winetest_do_flush(); + } InterlockedIncrement(&successes); return 1; } @@ -369,6 +386,7 @@ void __winetest_cdecl winetest_trace( const char *msg, ... ) __winetest_va_start(valist, msg); vprintf(msg, valist); __winetest_va_end(valist); + winetest_do_flush(); } } @@ -378,6 +396,7 @@ void winetest_vskip( const char *msg, __winetest_va_list args ) printf( "%s:%d: Tests skipped: ", data->current_file, data->current_line ); vprintf(msg, args); + winetest_do_flush(); skipped++; } @@ -443,7 +462,10 @@ void winetest_wait_child_process( HANDLE process ) DWORD exit_code = 1; if (WaitForSingleObject( process, 30000 )) + { printf( "%s: child process wait failed\n", current_test->name ); + winetest_do_flush(); + } else GetExitCodeProcess( process, &exit_code ); @@ -452,12 +474,14 @@ void winetest_wait_child_process( HANDLE process ) if (exit_code > 255) { printf( "%s: exception 0x%08x in child process\n", current_test->name, exit_code ); + winetest_do_flush(); InterlockedIncrement( &failures ); } else { printf( "%s: %u failures in child process\n", current_test->name, exit_code ); + winetest_do_flush(); while (exit_code-- > 0) InterlockedIncrement(&failures); } @@ -599,6 +623,7 @@ static int run_test( const char *name ) todo_successes, failures + todo_failures, (failures + todo_failures != 1) ? "failures" : "failure", skipped ); + winetest_do_flush(); } status = (failures + todo_failures < 255) ? failures + todo_failures : 255; return status; @@ -624,6 +649,7 @@ static LONG CALLBACK exc_filter( EXCEPTION_POINTERS *ptrs ) printf( "%s: unhandled exception %08x at %p\n", current_test->name, ptrs->ExceptionRecord->ExceptionCode, ptrs->ExceptionRecord->ExceptionAddress ); fflush( stdout ); + winetest_do_flush(); return EXCEPTION_EXECUTE_HANDLER; } @@ -660,6 +686,7 @@ int main( int argc, char **argv ) if (GetEnvironmentVariableA( "WINETEST_IS_CHILD", p, sizeof(p) )) winetest_is_child = atoi(p); /* Identify any future process as a child of this one */ SetEnvironmentVariableA( "WINETEST_IS_CHILD", "1" ); + if (GetEnvironmentVariableA( "WINETEST_FLUSH", p, sizeof(p) )) winetest_flush = atoi(p); if (!strcmp( winetest_platform, "windows" )) SetUnhandledExceptionFilter( exc_filter ); if (!winetest_interactive) SetErrorMode( SEM_FAILCRITICALERRORS | SEM_NOGPFAULTERRORBOX ); Both approaches could be combined. Comments? Suggestions? -- Francois Gouget <fgouget(a)codeweavers.com>

1 0

Re: [PATCH] winegstreamer: Avoid zero division in amt_from_gst_caps_video().
by Andrew Eikum Jan. 24, 2017

Jan. 24, 2017

Hi Masanori, Thank you for working on this! We're late in code freeze right now, can you please re-submit this patch after Wine 2.0 is released? Also, it would be better to use the MulDiv function to avoid integer overflow: vih->AvgTimePerFrame = (nom == 0) ? 0 : MulDiv(10000000, denom, nom); Andrew On Mon, Jan 23, 2017 at 10:29:19PM +0900, Masanori Kakura wrote: > Fixes https://bugs.winehq.org/show_bug.cgi?id=42212 > > Signed-off-by: Masanori Kakura <kakurasan(a)gmail.com> > --- > dlls/winegstreamer/gstdemux.c | 4 +--- > 1 file changed, 1 insertion(+), 3 deletions(-) > > diff --git a/dlls/winegstreamer/gstdemux.c b/dlls/winegstreamer/gstdemux.c > index c33ed9e..14ee584 100644 > --- a/dlls/winegstreamer/gstdemux.c > +++ b/dlls/winegstreamer/gstdemux.c > @@ -233,9 +233,7 @@ static gboolean amt_from_gst_caps_video(GstCaps *caps, AM_MEDIA_TYPE *amt) > bih->biCompression = amt->subtype.Data1; > } > bih->biSizeImage = width * height * bih->biBitCount / 8; > - vih->AvgTimePerFrame = 10000000; > - vih->AvgTimePerFrame *= denom; > - vih->AvgTimePerFrame /= nom; > + vih->AvgTimePerFrame = (nom == 0) ? 0 : 10000000 * denom / nom; > vih->rcSource.left = 0; > vih->rcSource.right = width; > vih->rcSource.top = height; > -- > 2.9.3 > > >

1 0

Re: dinput: Silence some effects feedback in linuxinput
by Andrew Eikum Jan. 24, 2017

Jan. 24, 2017

Instead of adding new cases, would you be opposed to just changing the FIXME into a TRACE or maybe a WARN? I think that would scale better, and users are likely only interested if they're doing dinput development anyway. Andrew

2 1