October 2012 - Wine-commits

Francois Gouget : testbot/scripts: Tweak CheckWineTestBot. pl to autodetect WineTestBot's lib directory.
by Alexandre Julliard 04 Oct '12

04 Oct '12

Module: tools Branch: master Commit: a3d18e577b233c443a3ddd2bc2c2f85ab3771be6 URL: http://source.winehq.org/git/tools.git/?a=commit;h=a3d18e577b233c443a3ddd2b… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Oct 4 14:38:08 2012 +0200 testbot/scripts: Tweak CheckWineTestBot.pl to autodetect WineTestBot's lib directory. --- testbot/scripts/CheckWineTestBot.pl | 9 ++++++++- 1 files changed, 8 insertions(+), 1 deletions(-) diff --git a/testbot/scripts/CheckWineTestBot.pl b/testbot/scripts/CheckWineTestBot.pl index 529fd94..2793a17 100755 --- a/testbot/scripts/CheckWineTestBot.pl +++ b/testbot/scripts/CheckWineTestBot.pl @@ -19,7 +19,14 @@ # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA use strict; -use lib "/usr/lib/winetestbot/lib"; + +my $Dir; +sub BEGIN +{ + $0 =~ m=^(.*)/[^/]*$=; + $Dir = $1; +} +use lib "$Dir/../lib"; use WineTestBot::Config; use WineTestBot::Engine::Notify;

1 0

Francois Gouget : testbot/lib: Tweak Log. pm to not open the log file for every message.
by Alexandre Julliard 04 Oct '12

04 Oct '12

Module: tools Branch: master Commit: 9267a1169b5d362c9499683b35a74a1454d4d309 URL: http://source.winehq.org/git/tools.git/?a=commit;h=9267a1169b5d362c9499683b… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Oct 4 14:40:08 2012 +0200 testbot/lib: Tweak Log.pm to not open the log file for every message. Also issue a meaningful message to stderr if we cannot open the log file. --- testbot/lib/WineTestBot/Log.pm | 26 +++++++++++++++++++------- 1 files changed, 19 insertions(+), 7 deletions(-) diff --git a/testbot/lib/WineTestBot/Log.pm b/testbot/lib/WineTestBot/Log.pm index a6762cc..6883968 100644 --- a/testbot/lib/WineTestBot/Log.pm +++ b/testbot/lib/WineTestBot/Log.pm @@ -32,16 +32,28 @@ require Exporter; @ISA = qw(Exporter); @EXPORT = qw(&LogMsg); -sub LogMsg +my $logfile; +sub LogMsg(@) { - my $oldumask = umask(002); - my $LOGFILE; - if (open LOGFILE, ">>$LogDir/log") + if (!defined $logfile) { - print LOGFILE scalar localtime, " ", @_; - close LOGFILE; + my $oldumask = umask(002); + if (open($logfile, ">>", "$LogDir/log")) + { + # Flush after each print + my $tmp=select($logfile); + $| = 1; + select($tmp); + } + else + { + require File::Basename; + print STDERR File::Basename::basename($0), ":warning: could not open '$LogDir/log' for writing: $!\n"; + $logfile = undef; + } + umask($oldumask); } - umask($oldumask); + print $logfile scalar localtime, " ", @_ if ($logfile); } 1;

1 0

Francois Gouget : testbot/Engine: Trace the start and stop of the WineTestBot Engine.
by Alexandre Julliard 04 Oct '12

04 Oct '12

Module: tools Branch: master Commit: 368982518d0c3a68792bba39c9ce990564a6f8c5 URL: http://source.winehq.org/git/tools.git/?a=commit;h=368982518d0c3a68792bba39… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Oct 4 14:40:21 2012 +0200 testbot/Engine: Trace the start and stop of the WineTestBot Engine. --- testbot/bin/Engine.pl | 3 +++ 1 files changed, 3 insertions(+), 0 deletions(-) diff --git a/testbot/bin/Engine.pl b/testbot/bin/Engine.pl index 947c24c..dfd4923 100755 --- a/testbot/bin/Engine.pl +++ b/testbot/bin/Engine.pl @@ -46,6 +46,7 @@ use WineTestBot::VMs; sub FatalError { LogMsg "Engine: ", @_; + LogMsg "Engine: WineTestBot Engine shutdown caused by a fatal error\n"; exit 1; } @@ -637,6 +638,7 @@ sub main $SIG{CHLD} = \&REAPER; $WineTestBot::Engine::Notify::RunningInEngine = 1; + LogMsg "Engine: Starting the WineTestBot Engine\n"; InitVMs(); @@ -758,6 +760,7 @@ sub main } } + LogMsg "Engine: Normal WineTestBot Engine shutdown\n"; return 0; }

1 0

Francois Gouget : testbot/scripts: Update the init. d script so it works with the LSB init functions.
by Alexandre Julliard 04 Oct '12

04 Oct '12

Module: tools Branch: master Commit: f00a4ec23c51d59934f209fb71110e11b72ca517 URL: http://source.winehq.org/git/tools.git/?a=commit;h=f00a4ec23c51d59934f209fb… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Oct 4 14:40:35 2012 +0200 testbot/scripts: Update the init.d script so it works with the LSB init functions. This makes it work on Debian. --- testbot/scripts/initd | 340 +++++++++++++++++++++++++++++-------------------- 1 files changed, 200 insertions(+), 140 deletions(-) Diff: http://source.winehq.org/git/tools.git/?a=commitdiff;h=f00a4ec23c51d59934f2…

1 0

Francois Gouget : testbot/doc: Update the installation instructions for WineHQ.
by Alexandre Julliard 04 Oct '12

04 Oct '12

Module: tools Branch: master Commit: 8eb5441f28f368ad4b485898ff9f854023dfca7a URL: http://source.winehq.org/git/tools.git/?a=commit;h=8eb5441f28f368ad4b485898… Author: Francois Gouget <fgouget(a)codeweavers.com> Date: Thu Oct 4 15:03:22 2012 +0200 testbot/doc: Update the installation instructions for WineHQ. --- testbot/doc/INSTALL.txt | 80 +++++++++++++++++------------------ testbot/doc/vhost_winetestbot.conf | 12 +++--- testbot/lib/WineTestBot/Config.pm | 6 +- testbot/lib/startup.pl | 2 +- 4 files changed, 49 insertions(+), 51 deletions(-) diff --git a/testbot/doc/INSTALL.txt b/testbot/doc/INSTALL.txt index f6ef966..7113c9a 100644 --- a/testbot/doc/INSTALL.txt +++ b/testbot/doc/INSTALL.txt @@ -28,29 +28,28 @@ Apache setup: perl.load symbolic link in /etc/apache2/mods-enabled. General setup for the web site: -- Create a new system group 'winetest' and a system user 'winetest', - make sure to make user winetest a member of group winetest. -- Unpack the WineTestBot source to /usr/lib/winetestbot (so this - document should be available as /usr/lib/winetestbot/doc/INSTALL.txt). -- Create directory /var/lib/winetestbot, create subdirs 'jobs', - 'latest', 'socket' and 'staging' within this dir. Set owner/group to - winetest/winetest for jobs, latest, socket, but set owner/group to - wwwrun/winetest for staging (where 'wwwrun' is the account your apache - server runs under). Run: - mkdir /var/lib/winetestbot - cd /var/lib/winetestbot +- Create a new system group 'winehq' and a system user 'winehq', + make sure to make user winehq a member of group winehq. +- Clone Wine's tools repository to $HOME/tools (so this document + should be available as $HOME/tools/testbot/doc/INSTALL.txt). +- Create directory $HOME/tools/testbot/var, create subdirs + 'jobs', 'latest', 'socket' and 'staging' and a file called log within this + directory. Set owner/group to wwwrun/winehq for staging (where 'wwwrun' is + the account your apache server runs under). Run: + cd $HOME/tools/testbot + mkdir var + cd var + touch log mkdir jobs latest patches socket staging - chown winetest:winetest jobs latest socket - chown WWWRUN:winetest staging + sudo chown WWWRUN:winehq staging chmod g+w * -- Create an empty logfile /var/log/winetestbot/log and make it writable - to group winetest. - mkdir /var/log/winetestbot - touch /var/log/winetestbot/log - chgrp winetest /var/log/winetestbot/log - chmod g+w /var/log/winetestbot/log -- Install scripts/initd in /etc/init.d/winetestbot and activate it (on - OpenSUSE: "chkconfig winetestbot on", "service winetestbot start"). +- If the installation path is different from the default, then some paths + in the following files will need to be modified: + testbot/lib/startup.pl + testbot/scripts/CheckWineTestBot.pl +- Install scripts/initd in /etc/init.d/winetestbot and adjust the paths and + user name if necessary. Then activate it. + (typically "chkconfig winetestbot on" or "service winetestbot start") - Copy lib/WineTestBot/ConfigLocalTemplate.pl to lib/WineTestBot/ConfigLocal.pl and fill in the options for your site. - Restart Apache, you should now be able to browse to the home page. @@ -68,10 +67,10 @@ General setup for the web site: Janitorial tasks: - Run the Janitor.pl script once per day to perform the janitorial tasks. For instance: - 17 30 * * * /usr/lib/winetestbot/bin/Janitor.pl + 17 30 * * * /home/winehq/tools/testbot/bin/Janitor.pl - Run the CheckWineTestBot.pl script periodically to get notified in case the WineTestBot server dies. For instance: - * 5 * * * /usr/lib/winetestbot/scripts/CheckWineTestBot.pl + * 5 * * * /home/winehq/tools/testbot/scripts/CheckWineTestBot.pl Setup for Wine's patches site: - See http://source.winehq.org/patches/ for reference. @@ -90,15 +89,15 @@ Setup for Wine's patches site: and send that email address to the patches maintainer. - Arrange for the PatchNotificationHandler.pl script to be fed the notification emails. One way to do so would be to use procmail and - add the following lines to the .procmailrc file: + add the following lines to the $HOME/.procmailrc file: :0: * ^Subject: New patches available at - | /usr/lib/winetestbot/bin/PatchNotificationHandler.pl + | $HOME/tools/testbot/bin/PatchNotificationHandler.pl Setup for Winetest updates: - Use a cron job to run CheckForWinetestUpdate.pl periodically. For instance: - * 0 * * * /usr/lib/winetestbot/scripts/CheckForWinetestUpdate.pl + * 0 * * * /home/winehq/tools/testbot/scripts/CheckForWinetestUpdate.pl Setup for wine-patches: - FIXME: WineTestBot now expects to receive the patches to test from @@ -108,14 +107,14 @@ Setup for wine-patches: skipped. - Arrange for the WinePatchesHandler.pl script to be fed the wine-patches emails. One way to do so would be to subscribe the - winetest user to the wine-patches mailing list and to then add the + winehq user to the wine-patches mailing list and to then add the following lines to the .procmailrc file: :0: * ^List-Id: Wine Patch Submissions - | /usr/lib/winetestbot/bin/WinePatchesHandler.pl + | $HOME/tools/testbot/bin/WinePatchesHandler.pl - Or if you have a set of patches to test in the mbox format you can test with: - formail -s /usr/lib/winetestbot/bin/WinePatchesHandler.pl <mbox-file + formail -s $HOME/tools/testbot/bin/WinePatchesHandler.pl <mbox-file 2. VM hosts setup @@ -130,19 +129,18 @@ Dependencies: - Create a Linux VM and set it up so it can generate PE executables with MinGW. For instance on Debian you should install autoconf, - bison, flex, gcc, gcc-mingw-w64, git and make. If you are going to have - 64bit VMs then make sure MinGW can generate 64bit PE executables. + bison, flex, gcc, gcc-mingw-w64, git and make. If you are going to + have 64bit VMs then make sure MinGW can generate 64bit PE executables. - Install netcat. -- Create a new system group 'winetest' and a system user 'winetest', - make sure to make user winetest a member of group winetest. -- Unpack winetestbot source to /usr/lib/winetestbot (so this document - should be available as /usr/lib/winetestbot/doc/INSTALL.txt). -- Create the /var/lib/winetestbot and /var/log/winetestbot directories - and make them writable to group winetest. - mkdir /var/log/winetestbot /var/lib/winetestbot - chgrp winetest /var/log/winetestbot /var/lib/winetestbot - chmod g+w /var/log/winetestbot /var/lib/winetestbot -- Clone the Wine git repository to /var/lib/winetestbot/wine-git. +- Create a new system group 'winehq' and a system user 'winehq', + make sure to make user winehq a member of group winehq. +- Clone Wine's tools repository to $HOME/tools (so this document + should be available as $HOME/tools/testbot/doc/INSTALL.txt). +- Create the $HOME/tools/testbot/var and $HOME/tools/testbot/log + directories and make them writable to group winehq. + mkdir $HOME/tools/testbot/var $HOME/tools/testbot/log + chmod g+w $HOME/tools/testbot/var $HOME/tools/testbot/log +- Clone the Wine git repository to $HOME/tools/testbot/var/wine-git. - Take a snapshot of the running VM. Make sure restoring this snapshot will result in a running build VM. - Register this VM as a build VM on the web site. diff --git a/testbot/doc/vhost_winetestbot.conf b/testbot/doc/vhost_winetestbot.conf index 55061d9..ca55933 100644 --- a/testbot/doc/vhost_winetestbot.conf +++ b/testbot/doc/vhost_winetestbot.conf @@ -1,13 +1,13 @@ <VirtualHost *:80> - DocumentRoot /usr/lib/winetestbot/web/ + DocumentRoot /home/winehq/tools/testbot/web/ ServerName winetestbot.example.com ServerAdmin winetestbot(a)example.com - PerlRequire /usr/lib/winetestbot/lib/startup.pl + PerlRequire /home/winehq/tools/testbot/lib/startup.pl PerlSwitches -Tw - <Directory /usr/lib/winetestbot/web> + <Directory /home/winehq/tools/testbot/web> AddHandler perl-script .pl PerlResponseHandler ModPerl::Registry PerlOptions +ParseHeaders @@ -22,7 +22,7 @@ </VirtualHost> <VirtualHost 192.168.0.1:443> - DocumentRoot /usr/lib/winetestbot/web/ + DocumentRoot /home/winehq/tools/testbot/web/ ServerName winetestbot.example.com ServerAdmin winetestbot(a)example.com @@ -31,10 +31,10 @@ SSLCertificateFile /etc/apache2/ssl.crt/winetestbot.example.com.crt SSLCertificateKeyFile /etc/apache2/ssl.key/winetestbot.example.com.key - PerlRequire /usr/lib/winetestbot/lib/startup.pl + PerlRequire /home/winehq/tools/testbot/lib/startup.pl PerlSwitches -Tw - <Directory /usr/lib/winetestbot/web> + <Directory /home/winehq/tools/testbot/web> AddHandler perl-script .pl PerlResponseHandler ModPerl::Registry PerlOptions +ParseHeaders diff --git a/testbot/lib/WineTestBot/Config.pm b/testbot/lib/WineTestBot/Config.pm index df40a0c..f547a64 100644 --- a/testbot/lib/WineTestBot/Config.pm +++ b/testbot/lib/WineTestBot/Config.pm @@ -50,9 +50,9 @@ require Exporter; $JobArchiveDays $WebHostName); @EXPORT_OK = qw($DbDataSource $DbUsername $DbPassword); -$LogDir = "/var/log/winetestbot"; -$DataDir = "/var/lib/winetestbot"; -$BinDir = "/usr/lib/winetestbot/bin"; +$LogDir = "/home/winehq/tools/testbot/var"; +$DataDir = "/home/winehq/tools/testbot/var"; +$BinDir = "/home/winehq/tools/testbot/bin"; $MaxRevertingVMs = 1; $MaxRunningVMs = 2; diff --git a/testbot/lib/startup.pl b/testbot/lib/startup.pl index 1016447..ca67505 100644 --- a/testbot/lib/startup.pl +++ b/testbot/lib/startup.pl @@ -16,7 +16,7 @@ use strict; -use lib qw(/usr/lib/winetestbot/lib); +use lib qw(/home/winehq/tools/testbot/lib); use ObjectModel::CGI::Page; use WineTestBot::CGI::PageBase;

1 0

Alexandre Julliard : winex11: Maintain a separate copy of the surface image bits when we need byte swapping .
by Alexandre Julliard 03 Oct '12

03 Oct '12

Module: wine Branch: master Commit: 70a511739eb7502340e800bbab0fa081cd35c82c URL: http://source.winehq.org/git/wine.git/?a=commit;h=70a511739eb7502340e800bba… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 3 13:09:00 2012 +0200 winex11: Maintain a separate copy of the surface image bits when we need byte swapping. --- dlls/winex11.drv/bitblt.c | 82 +++++++++++++++++++++++++++------------------ 1 files changed, 49 insertions(+), 33 deletions(-) diff --git a/dlls/winex11.drv/bitblt.c b/dlls/winex11.drv/bitblt.c index 2195fe5..b37007e 100644 --- a/dlls/winex11.drv/bitblt.c +++ b/dlls/winex11.drv/bitblt.c @@ -1553,10 +1553,10 @@ struct x11drv_window_surface GC gc; XImage *image; RECT bounds; - BOOL is_r8g8b8; + BOOL byteswap; BOOL is_argb; COLORREF color_key; - struct gdi_image_bits bits; + void *bits; CRITICAL_SECTION crit; BITMAPINFO info; /* variable size, must be last */ }; @@ -1626,7 +1626,7 @@ static void update_surface_region( struct x11drv_window_surface *surface ) { case 16: { - WORD *bits = surface->bits.ptr; + WORD *bits = surface->bits; int stride = (width + 1) & ~1; UINT mask = masks[0] | masks[1] | masks[2]; @@ -1645,7 +1645,7 @@ static void update_surface_region( struct x11drv_window_surface *surface ) } case 24: { - BYTE *bits = surface->bits.ptr; + BYTE *bits = surface->bits; int stride = (width * 3 + 3) & ~3; for (y = surface->header.rect.top; y < surface->header.rect.bottom; y++, bits += stride) @@ -1671,7 +1671,7 @@ static void update_surface_region( struct x11drv_window_surface *surface ) } case 32: { - DWORD *bits = surface->bits.ptr; + DWORD *bits = surface->bits; if (info->bmiHeader.biCompression == BI_RGB) { @@ -1778,7 +1778,7 @@ static void *x11drv_surface_get_bitmap_info( struct window_surface *window_surfa struct x11drv_window_surface *surface = get_x11_surface( window_surface ); memcpy( info, &surface->info, get_dib_info_size( &surface->info, DIB_RGB_COLORS )); - return surface->bits.ptr; + return surface->bits; } /*********************************************************************** @@ -1797,9 +1797,9 @@ static RECT *x11drv_surface_get_bounds( struct window_surface *window_surface ) static void x11drv_surface_flush( struct window_surface *window_surface ) { struct x11drv_window_surface *surface = get_x11_surface( window_surface ); + unsigned char *src = surface->bits; + unsigned char *dst = (unsigned char *)surface->image->data; struct bitblt_coords coords; - struct gdi_image_bits dst_bits; - const int *mapping = NULL; window_surface->funcs->lock( window_surface ); coords.x = 0; @@ -1811,27 +1811,31 @@ static void x11drv_surface_flush( struct window_surface *window_surface ) { TRACE( "flushing %p %dx%d bounds %s bits %p\n", surface, coords.width, coords.height, - wine_dbgstr_rect( &surface->bounds ), surface->bits.ptr ); + wine_dbgstr_rect( &surface->bounds ), surface->bits ); if (surface->is_argb || surface->color_key != CLR_INVALID) update_surface_region( surface ); - if (surface->image->bits_per_pixel == 4 || surface->image->bits_per_pixel == 8) - mapping = X11DRV_PALETTE_PaletteToXPixel; - - if (!copy_image_bits( &surface->info, surface->is_r8g8b8, surface->image, - &surface->bits, &dst_bits, &coords, mapping, ~0u )) + if (src != dst) { - surface->image->data = dst_bits.ptr; - XPutImage( gdi_display, surface->window, surface->gc, surface->image, - coords.visrect.left, 0, - surface->header.rect.left + coords.visrect.left, - surface->header.rect.top + coords.visrect.top, - coords.visrect.right - coords.visrect.left, - coords.visrect.bottom - coords.visrect.top ); - surface->image->data = NULL; + const int *mapping = NULL; + int width_bytes = surface->image->bytes_per_line; + + if (surface->image->bits_per_pixel == 4 || surface->image->bits_per_pixel == 8) + mapping = X11DRV_PALETTE_PaletteToXPixel; + + src += coords.visrect.top * width_bytes; + dst += coords.visrect.top * width_bytes; + copy_image_byteswap( &surface->info, src, dst, width_bytes, width_bytes, + coords.visrect.bottom - coords.visrect.top, + surface->byteswap, mapping, ~0u ); } - if (dst_bits.free) dst_bits.free( &dst_bits ); + XPutImage( gdi_display, surface->window, surface->gc, surface->image, + coords.visrect.left, coords.visrect.top, + surface->header.rect.left + coords.visrect.left, + surface->header.rect.top + coords.visrect.top, + coords.visrect.right - coords.visrect.left, + coords.visrect.bottom - coords.visrect.top ); } reset_bounds( &surface->bounds ); window_surface->funcs->unlock( window_surface ); @@ -1844,10 +1848,15 @@ static void x11drv_surface_destroy( struct window_surface *window_surface ) { struct x11drv_window_surface *surface = get_x11_surface( window_surface ); - TRACE( "freeing %p bits %p\n", surface, surface->bits.ptr ); + TRACE( "freeing %p bits %p\n", surface, surface->bits ); if (surface->gc) XFreeGC( gdi_display, surface->gc ); - if (surface->image) XDestroyImage( surface->image ); - if (surface->bits.free) surface->bits.free( &surface->bits ); + if (surface->image) + { + if (surface->image->data != surface->bits) HeapFree( GetProcessHeap(), 0, surface->bits ); + HeapFree( GetProcessHeap(), 0, surface->image->data ); + surface->image->data = NULL; + XDestroyImage( surface->image ); + } surface->crit.DebugInfo->Spare[0] = 0; DeleteCriticalSection( &surface->crit ); HeapFree( GetProcessHeap(), 0, surface ); @@ -1892,23 +1901,30 @@ struct window_surface *create_surface( Window window, const XVisualInfo *vis, co surface->header.rect = *rect; surface->header.ref = 1; surface->window = window; - surface->is_r8g8b8 = is_r8g8b8( vis ); surface->is_argb = (use_alpha && vis->depth == 32 && surface->info.bmiHeader.biCompression == BI_RGB); set_color_key( surface, color_key ); reset_bounds( &surface->bounds ); - if (!(surface->bits.ptr = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, - surface->info.bmiHeader.biSizeImage ))) - goto failed; - - surface->bits.free = free_heap_bits; surface->image = XCreateImage( gdi_display, vis->visual, vis->depth, ZPixmap, 0, NULL, width, height, 32, 0 ); if (!surface->image) goto failed; + surface->image->data = HeapAlloc( GetProcessHeap(), 0, surface->info.bmiHeader.biSizeImage ); + if (!surface->image->data) goto failed; + surface->gc = XCreateGC( gdi_display, window, 0, NULL ); + surface->byteswap = image_needs_byteswap( surface->image, is_r8g8b8(vis), format->bits_per_pixel ); + + if (surface->byteswap || format->bits_per_pixel == 4 || format->bits_per_pixel == 8) + { + /* allocate separate surface bits if byte swapping or palette mapping is required */ + if (!(surface->bits = HeapAlloc( GetProcessHeap(), HEAP_ZERO_MEMORY, + surface->info.bmiHeader.biSizeImage ))) + goto failed; + } + else surface->bits = surface->image->data; TRACE( "created %p for %lx %s bits %p-%p\n", surface, window, wine_dbgstr_rect(rect), - surface->bits.ptr, (char *)surface->bits.ptr + surface->info.bmiHeader.biSizeImage ); + surface->bits, (char *)surface->bits + surface->info.bmiHeader.biSizeImage ); return &surface->header;

1 0

Alexandre Julliard : winex11: Use the XShm extension to copy window surfaces.
by Alexandre Julliard 03 Oct '12

03 Oct '12

Module: wine Branch: master Commit: 5a9de7a4989dcf08914b5efd3152248a70be4548 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5a9de7a4989dcf08914b5efd3… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 3 15:26:08 2012 +0200 winex11: Use the XShm extension to copy window surfaces. --- dlls/winex11.drv/bitblt.c | 100 +++++++++++++++++++++++++++++++++++++++++---- 1 files changed, 92 insertions(+), 8 deletions(-) diff --git a/dlls/winex11.drv/bitblt.c b/dlls/winex11.drv/bitblt.c index b37007e..e1812cd 100644 --- a/dlls/winex11.drv/bitblt.c +++ b/dlls/winex11.drv/bitblt.c @@ -29,9 +29,18 @@ #include <X11/Xlib.h> #include <X11/Xresource.h> #include <X11/Xutil.h> -#ifdef HAVE_LIBXSHAPE +#ifdef HAVE_X11_EXTENSIONS_SHAPE_H #include <X11/extensions/shape.h> #endif +#ifdef HAVE_X11_EXTENSIONS_XSHM_H +# include <X11/extensions/XShm.h> +# ifdef HAVE_SYS_SHM_H +# include <sys/shm.h> +# endif +# ifdef HAVE_SYS_IPC_H +# include <sys/ipc.h> +# endif +#endif #include "windef.h" #include "winbase.h" @@ -1557,6 +1566,9 @@ struct x11drv_window_surface BOOL is_argb; COLORREF color_key; void *bits; +#ifdef HAVE_LIBXXSHM + XShmSegmentInfo shminfo; +#endif CRITICAL_SECTION crit; BITMAPINFO info; /* variable size, must be last */ }; @@ -1750,6 +1762,50 @@ static void set_color_key( struct x11drv_window_surface *surface, COLORREF key ) get_color_component( GetBValue(key), masks[2] ); } +#ifdef HAVE_LIBXXSHM +static int xshm_error_handler( Display *display, XErrorEvent *event, void *arg ) +{ + return 1; /* FIXME: should check event contents */ +} + +static XImage *create_shm_image( const XVisualInfo *vis, int width, int height, XShmSegmentInfo *shminfo ) +{ + XImage *image; + + shminfo->shmid = -1; + image = XShmCreateImage( gdi_display, vis->visual, vis->depth, ZPixmap, NULL, shminfo, width, height ); + if (!image) return NULL; + if (image->bytes_per_line & 3) goto failed; /* we need 32-bit alignment */ + + shminfo->shmid = shmget( IPC_PRIVATE, image->bytes_per_line * height, IPC_CREAT | 0700 ); + if (shminfo->shmid == -1) goto failed; + + shminfo->shmaddr = shmat( shminfo->shmid, 0, 0 ); + if (shminfo->shmaddr != (char *)-1) + { + BOOL ok; + + shminfo->readOnly = True; + X11DRV_expect_error( gdi_display, xshm_error_handler, NULL ); + ok = (XShmAttach( gdi_display, shminfo ) != 0); + XSync( gdi_display, False ); + if (!X11DRV_check_error() && ok) + { + image->data = shminfo->shmaddr; + shmctl( shminfo->shmid, IPC_RMID, 0 ); + return image; + } + shmdt( shminfo->shmaddr ); + } + shmctl( shminfo->shmid, IPC_RMID, 0 ); + shminfo->shmid = -1; + +failed: + XDestroyImage( image ); + return NULL; +} +#endif /* HAVE_LIBXXSHM */ + /*********************************************************************** * x11drv_surface_lock */ @@ -1830,6 +1886,19 @@ static void x11drv_surface_flush( struct window_surface *window_surface ) surface->byteswap, mapping, ~0u ); } +#ifdef HAVE_LIBXXSHM + if (surface->shminfo.shmid != -1) + { + XShmPutImage( gdi_display, surface->window, surface->gc, surface->image, + coords.visrect.left, coords.visrect.top, + surface->header.rect.left + coords.visrect.left, + surface->header.rect.top + coords.visrect.top, + coords.visrect.right - coords.visrect.left, + coords.visrect.bottom - coords.visrect.top, False ); + XSync( gdi_display, False ); + } + else +#endif XPutImage( gdi_display, surface->window, surface->gc, surface->image, coords.visrect.left, coords.visrect.top, surface->header.rect.left + coords.visrect.left, @@ -1853,6 +1922,14 @@ static void x11drv_surface_destroy( struct window_surface *window_surface ) if (surface->image) { if (surface->image->data != surface->bits) HeapFree( GetProcessHeap(), 0, surface->bits ); +#ifdef HAVE_LIBXXSHM + if (surface->shminfo.shmid != -1) + { + XShmDetach( gdi_display, &surface->shminfo ); + shmdt( surface->shminfo.shmaddr ); + } + else +#endif HeapFree( GetProcessHeap(), 0, surface->image->data ); surface->image->data = NULL; XDestroyImage( surface->image ); @@ -1905,11 +1982,17 @@ struct window_surface *create_surface( Window window, const XVisualInfo *vis, co set_color_key( surface, color_key ); reset_bounds( &surface->bounds ); - surface->image = XCreateImage( gdi_display, vis->visual, vis->depth, ZPixmap, 0, NULL, - width, height, 32, 0 ); - if (!surface->image) goto failed; - surface->image->data = HeapAlloc( GetProcessHeap(), 0, surface->info.bmiHeader.biSizeImage ); - if (!surface->image->data) goto failed; +#ifdef HAVE_LIBXXSHM + surface->image = create_shm_image( vis, width, height, &surface->shminfo ); + if (!surface->image) +#endif + { + surface->image = XCreateImage( gdi_display, vis->visual, vis->depth, ZPixmap, 0, NULL, + width, height, 32, 0 ); + if (!surface->image) goto failed; + surface->image->data = HeapAlloc( GetProcessHeap(), 0, surface->info.bmiHeader.biSizeImage ); + if (!surface->image->data) goto failed; + } surface->gc = XCreateGC( gdi_display, window, 0, NULL ); surface->byteswap = image_needs_byteswap( surface->image, is_r8g8b8(vis), format->bits_per_pixel ); @@ -1923,8 +2006,9 @@ struct window_surface *create_surface( Window window, const XVisualInfo *vis, co } else surface->bits = surface->image->data; - TRACE( "created %p for %lx %s bits %p-%p\n", surface, window, wine_dbgstr_rect(rect), - surface->bits, (char *)surface->bits + surface->info.bmiHeader.biSizeImage ); + TRACE( "created %p for %lx %s bits %p-%p image %p\n", surface, window, wine_dbgstr_rect(rect), + surface->bits, (char *)surface->bits + surface->info.bmiHeader.biSizeImage, + surface->image->data ); return &surface->header;

1 0

Alexandre Julliard : Revert "winex11: Remove some leftover X Shm code."
by Alexandre Julliard 03 Oct '12

03 Oct '12

Module: wine Branch: master Commit: 85b34be52ffb9c964ba5ff79c93ca286ad47fbd8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=85b34be52ffb9c964ba5ff79c… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Oct 3 15:30:37 2012 +0200 Revert "winex11: Remove some leftover X Shm code." This reverts commit 515329d58cbe692b17108f8b2ea74e91edd06481. We'll want to use XShm again for window surfaces. --- configure | 63 +++++++++++++++++++++++++++++++++++++++++++++++++++ configure.ac | 13 ++++++++++ include/config.h.in | 6 +++++ 3 files changed, 82 insertions(+), 0 deletions(-) diff --git a/configure b/configure index d18cc0e..57f1e58 100755 --- a/configure +++ b/configure @@ -838,6 +838,7 @@ with_xml with_xrandr with_xrender with_xshape +with_xshm with_xslt with_xxf86vm with_zlib @@ -1527,6 +1528,7 @@ Optional Packages: --without-xrandr do not use Xrandr (resolution changes) --without-xrender do not use the Xrender extension --without-xshape do not use the Xshape extension + --without-xshm do not use XShm (shared memory extension) --without-xslt do not use XSLT --without-xxf86vm do not use XFree video mode extension --without-zlib do not use Zlib (data compression) @@ -2777,6 +2779,12 @@ if test "${with_xshape+set}" = set; then : fi +# Check whether --with-xshm was given. +if test "${with_xshm+set}" = set; then : + withval=$with_xshm; if test "x$withval" = "xno"; then ac_cv_header_X11_extensions_XShm_h=no; fi +fi + + # Check whether --with-xslt was given. if test "${with_xslt+set}" = set; then : withval=$with_xslt; @@ -8085,6 +8093,7 @@ fi X11/extensions/shape.h \ X11/extensions/XInput.h \ X11/extensions/XInput2.h \ + X11/extensions/XShm.h \ X11/extensions/Xcomposite.h \ X11/extensions/Xinerama.h \ X11/extensions/Xrandr.h \ @@ -8292,6 +8301,60 @@ esac fi fi + if test "$ac_cv_header_X11_extensions_XShm_h" = "yes" + then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XShmQueryExtension in -lXext" >&5 +$as_echo_n "checking for XShmQueryExtension in -lXext... " >&6; } +if ${ac_cv_lib_Xext_XShmQueryExtension+:} false; then : + $as_echo_n "(cached) " >&6 +else + ac_check_lib_save_LIBS=$LIBS +LIBS="-lXext $X_LIBS $XLIB $X_EXTRA_LIBS $LIBS" +cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ + +/* Override any GCC internal prototype to avoid an error. + Use char because int might match the return type of a GCC + builtin and then its argument prototype would still apply. */ +#ifdef __cplusplus +extern "C" +#endif +char XShmQueryExtension (); +int +main () +{ +return XShmQueryExtension (); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_link "$LINENO"; then : + ac_cv_lib_Xext_XShmQueryExtension=yes +else + ac_cv_lib_Xext_XShmQueryExtension=no +fi +rm -f core conftest.err conftest.$ac_objext \ + conftest$ac_exeext conftest.$ac_ext +LIBS=$ac_check_lib_save_LIBS +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_Xext_XShmQueryExtension" >&5 +$as_echo "$ac_cv_lib_Xext_XShmQueryExtension" >&6; } +if test "x$ac_cv_lib_Xext_XShmQueryExtension" = xyes; then : + +$as_echo "#define HAVE_LIBXXSHM 1" >>confdefs.h + +fi + + fi + if test "$ac_cv_lib_Xext_XShmQueryExtension" != "yes"; then : + case "x$with_xshm" in + x) as_fn_append wine_notices "|XShm ${notice_platform}development files not found, X Shared Memory won't be supported." ;; + xno) ;; + *) as_fn_error $? "XShm ${notice_platform}development files not found, X Shared Memory won't be supported. +This is an error since --with-xshm was requested." "$LINENO" 5 ;; +esac +fi + if test "$ac_cv_header_X11_extensions_shape_h" = "yes" then { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XShapeQueryExtension in -lXext" >&5 diff --git a/configure.ac b/configure.ac index 5c7e9a2..0479899 100644 --- a/configure.ac +++ b/configure.ac @@ -97,6 +97,8 @@ AC_ARG_WITH(xrender, AS_HELP_STRING([--without-xrender],[do not use the Xrende [if test "x$withval" = "xno"; then ac_cv_header_X11_extensions_Xrender_h=no; fi]) AC_ARG_WITH(xshape, AS_HELP_STRING([--without-xshape],[do not use the Xshape extension]), [if test "x$withval" = "xno"; then ac_cv_header_X11_extensions_shape_h=no; fi]) +AC_ARG_WITH(xshm, AS_HELP_STRING([--without-xshm],[do not use XShm (shared memory extension)]), + [if test "x$withval" = "xno"; then ac_cv_header_X11_extensions_XShm_h=no; fi]) AC_ARG_WITH(xslt, AS_HELP_STRING([--without-xslt],[do not use XSLT])) AC_ARG_WITH(xxf86vm, AS_HELP_STRING([--without-xxf86vm],[do not use XFree video mode extension]), [if test "x$withval" = "xno"; then ac_cv_header_X11_extensions_xf86vmode_h=no; ac_cv_header_X11_extensions_xf86vmproto_h=no; fi]) @@ -972,6 +974,7 @@ then X11/extensions/shape.h \ X11/extensions/XInput.h \ X11/extensions/XInput2.h \ + X11/extensions/XShm.h \ X11/extensions/Xcomposite.h \ X11/extensions/Xinerama.h \ X11/extensions/Xrandr.h \ @@ -1016,6 +1019,16 @@ then [XInput2 headers not found, the XInput 2 extension won't be supported.]) fi + dnl *** Check for X Shm extension + if test "$ac_cv_header_X11_extensions_XShm_h" = "yes" + then + AC_CHECK_LIB(Xext, XShmQueryExtension, + AC_DEFINE(HAVE_LIBXXSHM, 1, [Define if you have the X Shm extension]),, + $X_LIBS $XLIB $X_EXTRA_LIBS) + fi + WINE_NOTICE_WITH(xshm,[test "$ac_cv_lib_Xext_XShmQueryExtension" != "yes"], + [XShm ${notice_platform}development files not found, X Shared Memory won't be supported.]) + dnl *** Check for X shape extension if test "$ac_cv_header_X11_extensions_shape_h" = "yes" then diff --git a/include/config.h.in b/include/config.h.in index 67f4fe4..39f1ec2 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -377,6 +377,9 @@ /* Define to 1 if you have the <libxslt/transform.h> header file. */ #undef HAVE_LIBXSLT_TRANSFORM_H +/* Define if you have the X Shm extension */ +#undef HAVE_LIBXXSHM + /* Define to 1 if you have the <link.h> header file. */ #undef HAVE_LINK_H @@ -1106,6 +1109,9 @@ /* Define to 1 if you have the <X11/extensions/Xrender.h> header file. */ #undef HAVE_X11_EXTENSIONS_XRENDER_H +/* Define to 1 if you have the <X11/extensions/XShm.h> header file. */ +#undef HAVE_X11_EXTENSIONS_XSHM_H + /* Define to 1 if you have the <X11/Xcursor/Xcursor.h> header file. */ #undef HAVE_X11_XCURSOR_XCURSOR_H

1 0

Aric Stewart : imm32: Have IMM class use DefWindowProc.
by Alexandre Julliard 03 Oct '12

03 Oct '12

Module: wine Branch: master Commit: e9f3030c51f7619fbbb4f5dc6a7642d035aa7815 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e9f3030c51f7619fbbb4f5dc6… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Oct 3 06:54:39 2012 -0500 imm32: Have IMM class use DefWindowProc. --- dlls/imm32/imm.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index cf76df1..015b8ab 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -2914,6 +2914,6 @@ static LRESULT WINAPI DefIME_WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, PostMessageW(immHkl->UIWnd,uMsg,wParam,lParam); return TRUE; } - return FALSE; + return DefWindowProcW(hwnd, uMsg, wParam, lParam); } }

1 0

Aric Stewart : imm32: Explicitly handle all WM_IME_XXX messages in the IME class.
by Alexandre Julliard 03 Oct '12

03 Oct '12

Module: wine Branch: master Commit: fb5dbd608fbe09f1e3b09745b47233c8ed051446 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fb5dbd608fbe09f1e3b09745b… Author: Aric Stewart <aric(a)codeweavers.com> Date: Wed Oct 3 07:12:44 2012 -0500 imm32: Explicitly handle all WM_IME_XXX messages in the IME class. --- dlls/imm32/imm.c | 14 ++++++++++---- 1 files changed, 10 insertions(+), 4 deletions(-) diff --git a/dlls/imm32/imm.c b/dlls/imm32/imm.c index 015b8ab..6f262f5 100644 --- a/dlls/imm32/imm.c +++ b/dlls/imm32/imm.c @@ -2888,12 +2888,18 @@ static LRESULT WINAPI DefIME_WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, case WM_CREATE: case WM_NCCREATE: return TRUE; - case WM_IME_COMPOSITION: case WM_IME_STARTCOMPOSITION: case WM_IME_ENDCOMPOSITION: - case WM_IME_SELECT: - case WM_IME_CONTROL: + case WM_IME_COMPOSITION: + case WM_IME_SETCONTEXT: case WM_IME_NOTIFY: + case WM_IME_CONTROL: + case WM_IME_COMPOSITIONFULL: + case WM_IME_SELECT: + case WM_IME_CHAR: + case WM_IME_REQUEST: + case WM_IME_KEYDOWN: + case WM_IME_KEYUP: { ImmHkl *immHkl = IMM_GetImmHkl(GetKeyboardLayout(0)); if (immHkl->UIWnd) @@ -2902,7 +2908,7 @@ static LRESULT WINAPI DefIME_WindowProc(HWND hwnd, UINT uMsg, WPARAM wParam, } default: if ((uMsg == WM_MSIME_RECONVERTOPTIONS) || - (uMsg ==WM_MSIME_SERVICE) || + (uMsg == WM_MSIME_SERVICE) || (uMsg == WM_MSIME_MOUSE) || (uMsg == WM_MSIME_RECONVERTREQUEST) || (uMsg == WM_MSIME_RECONVERT) ||

1 0