October 2012 - Wine-commits

Alexandre Julliard : winex11: Don' t put window manager decorations on layered windows.
by Alexandre Julliard 02 Oct '12

02 Oct '12

Module: wine Branch: master Commit: a81c23a450f9638dd512e43709b74c322ac5b510 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a81c23a450f9638dd512e4370… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Oct 2 13:51:56 2012 +0200 winex11: Don't put window manager decorations on layered windows. --- dlls/winex11.drv/window.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 45c3a36..344fe44 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -261,6 +261,7 @@ static unsigned long get_mwm_decorations( struct x11drv_win_data *data, if (data->shaped) return 0; if (ex_style & WS_EX_TOOLWINDOW) return 0; + if (ex_style & WS_EX_LAYERED) return 0; if ((style & WS_CAPTION) == WS_CAPTION) {

1 0

Alexandre Julliard : winex11: Add support for per-window visuals.
by Alexandre Julliard 02 Oct '12

02 Oct '12

Module: wine Branch: master Commit: 8dcbeff760115834656f3f1fc85922e3a9af14d0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=8dcbeff760115834656f3f1fc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 26 12:19:37 2012 +0200 winex11: Add support for per-window visuals. --- dlls/winex11.drv/desktop.c | 3 +-- dlls/winex11.drv/window.c | 24 +++++++++++++++--------- dlls/winex11.drv/x11drv.h | 2 ++ 3 files changed, 18 insertions(+), 11 deletions(-) diff --git a/dlls/winex11.drv/desktop.c b/dlls/winex11.drv/desktop.c index 3448afd..8d9de20 100644 --- a/dlls/winex11.drv/desktop.c +++ b/dlls/winex11.drv/desktop.c @@ -190,8 +190,7 @@ static BOOL CALLBACK update_windows_on_desktop_resize( HWND hwnd, LPARAM lparam changes.x = data->whole_rect.left - virtual_screen_rect.left; changes.y = data->whole_rect.top - virtual_screen_rect.top; - XReconfigureWMWindow( data->display, data->whole_window, - DefaultScreen(data->display), mask, &changes ); + XReconfigureWMWindow( data->display, data->whole_window, data->vis.screen, mask, &changes ); } release_win_data( data ); if (hwnd == GetForegroundWindow()) clip_fullscreen_window( hwnd, TRUE ); diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index 344fe44..b3d7279 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -312,7 +312,7 @@ static void get_x11_rect_offset( struct x11drv_win_data *data, RECT *rect ) static int get_window_attributes( struct x11drv_win_data *data, XSetWindowAttributes *attr ) { attr->override_redirect = !data->managed; - attr->colormap = default_colormap; + attr->colormap = data->colormap ? data->colormap : default_colormap; attr->save_under = ((GetClassLongW( data->hwnd, GCL_STYLE ) & CS_SAVEBITS) != 0); attr->bit_gravity = NorthWestGravity; attr->win_gravity = StaticGravity; @@ -1110,7 +1110,7 @@ static void unmap_window( HWND hwnd ) if (data->embedded) set_xembed_flags( data, 0 ); else if (!data->managed) XUnmapWindow( data->display, data->whole_window ); - else XWithdrawWindow( data->display, data->whole_window, DefaultScreen(data->display) ); + else XWithdrawWindow( data->display, data->whole_window, data->vis.screen ); data->mapped = FALSE; data->net_wm_state = 0; @@ -1132,7 +1132,7 @@ void make_window_embedded( HWND hwnd ) if (data->mapped) { if (data->managed) XUnmapWindow( data->display, data->whole_window ); - else XWithdrawWindow( data->display, data->whole_window, DefaultScreen(data->display) ); + else XWithdrawWindow( data->display, data->whole_window, data->vis.screen ); data->net_wm_state = 0; } data->embedded = TRUE; @@ -1244,8 +1244,7 @@ static void sync_window_position( struct x11drv_win_data *data, set_size_hints( data, style ); set_mwm_hints( data, style, ex_style ); data->configure_serial = NextRequest( data->display ); - XReconfigureWMWindow( data->display, data->whole_window, - DefaultScreen(data->display), mask, &changes ); + XReconfigureWMWindow( data->display, data->whole_window, data->vis.screen, mask, &changes ); #ifdef HAVE_LIBXSHAPE if (IsRectEmpty( old_window_rect ) != IsRectEmpty( &data->window_rect )) sync_window_region( data, (HRGN)1 ); @@ -1367,6 +1366,9 @@ static void create_whole_window( struct x11drv_win_data *data ) } data->shaped = (win_rgn != 0); + if (data->vis.visualid != default_visual.visualid) + data->colormap = XCreateColormap( data->display, root_window, data->vis.visual, AllocNone ); + mask = get_window_attributes( data, &attr ); data->whole_rect = data->window_rect; @@ -1379,8 +1381,8 @@ static void create_whole_window( struct x11drv_win_data *data ) data->whole_window = XCreateWindow( data->display, root_window, data->whole_rect.left - virtual_screen_rect.left, data->whole_rect.top - virtual_screen_rect.top, - cx, cy, 0, default_visual.depth, InputOutput, - default_visual.visual, mask, &attr ); + cx, cy, 0, data->vis.depth, InputOutput, + data->vis.visual, mask, &attr ); if (!data->whole_window) goto done; set_initial_wm_hints( data->display, data->whole_window ); @@ -1435,7 +1437,9 @@ static void destroy_whole_window( struct x11drv_win_data *data, BOOL already_des TRACE( "win %p xwin %lx\n", data->hwnd, data->whole_window ); XDeleteContext( data->display, data->whole_window, winContext ); if (!already_destroyed) XDestroyWindow( data->display, data->whole_window ); + if (data->colormap) XFreeColormap( data->display, data->colormap ); data->whole_window = 0; + data->colormap = 0; data->wm_state = WithdrawnState; data->net_wm_state = 0; data->mapped = FALSE; @@ -1542,6 +1546,7 @@ static struct x11drv_win_data *alloc_win_data( Display *display, HWND hwnd ) if ((data = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*data)))) { data->display = display; + data->vis = default_visual; data->hwnd = hwnd; EnterCriticalSection( &win_data_section ); XSaveContext( gdi_display, (XID)hwnd, win_data_context, (char *)data ); @@ -2034,6 +2039,7 @@ void CDECL X11DRV_WindowPosChanging( HWND hwnd, HWND insert_after, UINT swp_flag if (!data->whole_window) goto done; if (swp_flags & SWP_HIDEWINDOW) goto done; + if (data->vis.visualid != default_visual.visualid) goto done; if (*surface) window_surface_release( *surface ); *surface = NULL; /* indicate that we want to draw directly to the window */ @@ -2059,7 +2065,7 @@ void CDECL X11DRV_WindowPosChanging( HWND hwnd, HWND insert_after, UINT swp_flag if (!layered || !GetLayeredWindowAttributes( hwnd, &key, NULL, &flags ) || !(flags & LWA_COLORKEY)) key = CLR_INVALID; - *surface = create_surface( data->whole_window, &default_visual, &surface_rect, key ); + *surface = create_surface( data->whole_window, &data->vis, &surface_rect, key ); done: release_win_data( data ); @@ -2185,7 +2191,7 @@ void CDECL X11DRV_WindowPosChanged( HWND hwnd, HWND insert_after, UINT swp_flags data->iconic = (new_style & WS_MINIMIZE) != 0; TRACE( "changing win %p iconic state to %u\n", data->hwnd, data->iconic ); if (data->iconic) - XIconifyWindow( data->display, data->whole_window, DefaultScreen(data->display) ); + XIconifyWindow( data->display, data->whole_window, data->vis.screen ); else if (is_window_rect_mapped( rectWindow )) XMapWindow( data->display, data->whole_window ); update_net_wm_states( data ); diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index 7a7cfd3..5557f7c 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -530,6 +530,8 @@ enum x11drv_net_wm_state struct x11drv_win_data { Display *display; /* display connection for the thread owning the window */ + XVisualInfo vis; /* X visual used by this window */ + Colormap colormap; /* colormap if non-default visual */ HWND hwnd; /* hwnd that this private data belongs to */ Window whole_window; /* X window for the complete window */ RECT window_rect; /* USER window rectangle relative to parent */

1 0

Alexandre Julliard : winex11: Switch to an ARGB visual for layered windows with per-pixel alpha.
by Alexandre Julliard 02 Oct '12

02 Oct '12

Module: wine Branch: master Commit: f12c1c6630f0bf842dde9af10da4ab188ff16e94 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f12c1c6630f0bf842dde9af10… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Wed Sep 26 13:12:17 2012 +0200 winex11: Switch to an ARGB visual for layered windows with per-pixel alpha. --- dlls/winex11.drv/event.c | 2 + dlls/winex11.drv/window.c | 111 +++++++++++++++++++++++++++++----------- dlls/winex11.drv/x11drv.h | 2 + dlls/winex11.drv/x11drv_main.c | 21 +++++++- 4 files changed, 103 insertions(+), 33 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=f12c1c6630f0bf842dde9…

1 0

Alexandre Julliard : winex11: Take the alpha channel into account to compute the region of layered windows .
by Alexandre Julliard 02 Oct '12

02 Oct '12

Module: wine Branch: master Commit: d8247efd5ecb8c4604624eb2bbf47e194ce59e7e URL: http://source.winehq.org/git/wine.git/?a=commit;h=d8247efd5ecb8c4604624eb2b… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Thu Sep 27 20:47:08 2012 +0200 winex11: Take the alpha channel into account to compute the region of layered windows. --- dlls/winex11.drv/bitblt.c | 45 ++++++++++++++++++++++++++++++++++----------- dlls/winex11.drv/window.c | 5 +++-- dlls/winex11.drv/x11drv.h | 3 ++- 3 files changed, 39 insertions(+), 14 deletions(-) diff --git a/dlls/winex11.drv/bitblt.c b/dlls/winex11.drv/bitblt.c index 8701d73..ceecb0c 100644 --- a/dlls/winex11.drv/bitblt.c +++ b/dlls/winex11.drv/bitblt.c @@ -1545,6 +1545,7 @@ struct x11drv_window_surface XImage *image; RECT bounds; BOOL is_r8g8b8; + BOOL is_argb; COLORREF color_key; struct gdi_image_bits bits; CRITICAL_SECTION crit; @@ -1598,7 +1599,7 @@ static void update_surface_region( struct x11drv_window_surface *surface ) int x, y, start, width; HRGN rgn; - if (surface->color_key == CLR_INVALID) + if (!surface->is_argb && surface->color_key == CLR_INVALID) { XShapeCombineMask( gdi_display, surface->window, ShapeBounding, 0, 0, None, ShapeSet ); return; @@ -1662,17 +1663,38 @@ static void update_surface_region( struct x11drv_window_surface *surface ) case 32: { DWORD *bits = surface->bits.ptr; - UINT mask = info->bmiHeader.biCompression == BI_RGB ? 0xffffff : (masks[0] | masks[1] | masks[2]); - for (y = surface->header.rect.top; y < surface->header.rect.bottom; y++, bits += width) + if (info->bmiHeader.biCompression == BI_RGB) { - x = 0; - while (x < width) + for (y = surface->header.rect.top; y < surface->header.rect.bottom; y++, bits += width) { - while (x < width && (bits[x] & mask) == surface->color_key) x++; - start = x; - while (x < width && (bits[x] & mask) != surface->color_key) x++; - add_row( rgn, data, surface->header.rect.left + start, y, x - start ); + x = 0; + while (x < width) + { + while (x < width && + ((bits[x] & 0xffffff) == surface->color_key || + (surface->is_argb && !(bits[x] & 0xff000000)))) x++; + start = x; + while (x < width && + ((bits[x] & 0xffffff) != surface->color_key || + !(surface->is_argb && !(bits[x] & 0xff000000)))) x++; + add_row( rgn, data, surface->header.rect.left + start, y, x - start ); + } + } + } + else + { + UINT mask = masks[0] | masks[1] | masks[2]; + for (y = surface->header.rect.top; y < surface->header.rect.bottom; y++, bits += width) + { + x = 0; + while (x < width) + { + while (x < width && (bits[x] & mask) == surface->color_key) x++; + start = x; + while (x < width && (bits[x] & mask) != surface->color_key) x++; + add_row( rgn, data, surface->header.rect.left + start, y, x - start ); + } } } break; @@ -1782,7 +1804,7 @@ static void x11drv_surface_flush( struct window_surface *window_surface ) surface, coords.width, coords.height, wine_dbgstr_rect( &surface->bounds ), surface->bits.ptr ); - if (surface->color_key != CLR_INVALID) update_surface_region( surface ); + 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; @@ -1836,7 +1858,7 @@ static const struct window_surface_funcs x11drv_surface_funcs = * create_surface */ struct window_surface *create_surface( Window window, const XVisualInfo *vis, const RECT *rect, - COLORREF color_key ) + COLORREF color_key, BOOL use_alpha ) { const XPixmapFormatValues *format = pixmap_formats[vis->depth]; struct x11drv_window_surface *surface; @@ -1862,6 +1884,7 @@ struct window_surface *create_surface( Window window, const XVisualInfo *vis, co 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, diff --git a/dlls/winex11.drv/window.c b/dlls/winex11.drv/window.c index f090b2d..5b68968 100644 --- a/dlls/winex11.drv/window.c +++ b/dlls/winex11.drv/window.c @@ -2084,7 +2084,7 @@ void CDECL X11DRV_WindowPosChanging( HWND hwnd, HWND insert_after, UINT swp_flag if (!layered || !GetLayeredWindowAttributes( hwnd, &key, NULL, &flags ) || !(flags & LWA_COLORKEY)) key = CLR_INVALID; - *surface = create_surface( data->whole_window, &data->vis, &surface_rect, key ); + *surface = create_surface( data->whole_window, &data->vis, &surface_rect, key, FALSE ); done: release_win_data( data ); @@ -2384,7 +2384,8 @@ BOOL CDECL X11DRV_UpdateLayeredWindow( HWND hwnd, const UPDATELAYEREDWINDOWINFO surface = data->surface; if (!surface || memcmp( &surface->rect, &rect, sizeof(RECT) )) { - data->surface = create_surface( data->whole_window, &data->vis, &rect, color_key ); + data->surface = create_surface( data->whole_window, &data->vis, &rect, + color_key, !data->embedded ); if (surface) window_surface_release( surface ); surface = data->surface; } diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h index f496158..05c8ca9 100644 --- a/dlls/winex11.drv/x11drv.h +++ b/dlls/winex11.drv/x11drv.h @@ -190,7 +190,8 @@ extern Pixmap create_pixmap_from_image( HDC hdc, const XVisualInfo *vis, const B const struct gdi_image_bits *bits, UINT coloruse ) DECLSPEC_HIDDEN; extern DWORD get_pixmap_image( Pixmap pixmap, int width, int height, const XVisualInfo *vis, BITMAPINFO *info, struct gdi_image_bits *bits ) DECLSPEC_HIDDEN; -extern struct window_surface *create_surface( Window window, const XVisualInfo *vis, const RECT *rect, COLORREF color_key ) DECLSPEC_HIDDEN; +extern struct window_surface *create_surface( Window window, const XVisualInfo *vis, const RECT *rect, + COLORREF color_key, BOOL use_alpha ) DECLSPEC_HIDDEN; extern void set_surface_color_key( struct window_surface *window_surface, COLORREF color_key ) DECLSPEC_HIDDEN; extern RGNDATA *X11DRV_GetRegionData( HRGN hrgn, HDC hdc_lptodp ) DECLSPEC_HIDDEN;

1 0

Alexandre Julliard : winex11: Use ARGB layered windows for system tray icons when supported.
by Alexandre Julliard 02 Oct '12

02 Oct '12

Module: wine Branch: master Commit: e03b8e1a1d1a553dbfcb20dcfccf92d4c17eade6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e03b8e1a1d1a553dbfcb20dcf… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Mon Oct 1 15:59:49 2012 +0200 winex11: Use ARGB layered windows for system tray icons when supported. --- dlls/winex11.drv/systray.c | 140 +++++++++++++++++++++++++++++++++++++-- dlls/winex11.drv/window.c | 11 +-- dlls/winex11.drv/x11drv.h | 3 +- dlls/winex11.drv/x11drv_main.c | 1 + 4 files changed, 138 insertions(+), 17 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=e03b8e1a1d1a553dbfcb2…

1 0

Erich Hoover : ws2_32: Permit broadcast packets on interface-bound sockets for systems with IP_BOUND_IF .
by Alexandre Julliard 02 Oct '12

02 Oct '12

Module: wine Branch: master Commit: 9f2f7600c5d79e243b6cd670c1506e273add99c6 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9f2f7600c5d79e243b6cd670c… Author: Erich Hoover <ehoover(a)mines.edu> Date: Wed Sep 26 16:38:09 2012 -0600 ws2_32: Permit broadcast packets on interface-bound sockets for systems with IP_BOUND_IF. --- dlls/ws2_32/socket.c | 64 ++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 64 insertions(+), 0 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 7b86ca4..d645872 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -2107,6 +2107,68 @@ static int WINAPI WS2_WSARecvMsg( SOCKET s, LPWSAMSG msg, LPDWORD lpNumberOfByte } /*********************************************************************** + * interface_bind (INTERNAL) + * + * Take bind() calls on any name corresponding to a local network adapter and restrict the given socket to + * operating only on the specified interface. This restriction consists of two components: + * 1) An outgoing packet restriction suggesting the egress interface for all packets. + * 2) An incoming packet restriction dropping packets not meant for the interface. + * If the function succeeds in placing these restrictions (returns TRUE) then the name for the bind() may + * safely be changed to INADDR_ANY, permitting the transmission and receipt of broadcast packets on the + * socket. This behavior is only relevant to UDP sockets and is needed for applications that expect to be able + * to receive broadcast packets on a socket that is bound to a specific network interface. + */ +static BOOL interface_bind( SOCKET s, int fd, struct sockaddr *addr ) +{ + struct sockaddr_in *in_sock = (struct sockaddr_in *) addr; + unsigned int sock_type = 0, optlen = sizeof(sock_type); + PIP_ADAPTER_INFO adapters = NULL, adapter; + BOOL ret = FALSE; + DWORD adap_size; + int enable = 1; + + if (in_sock->sin_addr.s_addr == htonl(WS_INADDR_ANY)) + return FALSE; /* Not binding to specific interface, uses default route */ + if (getsockopt(fd, SOL_SOCKET, SO_TYPE, &sock_type, &optlen) == -1 || sock_type != SOCK_DGRAM) + return FALSE; /* Special interface binding is only necessary for UDP datagrams. */ + if (GetAdaptersInfo(NULL, &adap_size) != ERROR_BUFFER_OVERFLOW) + goto cleanup; + adapters = HeapAlloc(GetProcessHeap(), 0, adap_size); + if (adapters == NULL || GetAdaptersInfo(adapters, &adap_size) != NO_ERROR) + goto cleanup; + /* Search the IPv4 adapter list for the appropriate binding interface */ + for (adapter = adapters; adapter != NULL; adapter = adapter->Next) + { + in_addr_t adapter_addr = (in_addr_t) inet_addr(adapter->IpAddressList.IpAddress.String); + + if (in_sock->sin_addr.s_addr == adapter_addr) + { +#if defined(IP_BOUND_IF) + /* IP_BOUND_IF sets both the incoming and outgoing restriction at once */ + if (setsockopt(fd, IPPROTO_IP, IP_BOUND_IF, &adapter->Index, sizeof(adapter->Index)) != 0) + goto cleanup; + ret = TRUE; +#else + FIXME("Broadcast packets on interface-bound sockets are not currently supported on this platform, " + "receiving broadcast packets will not work on socket %04lx.\n", s); +#endif + break; + } + } + /* Will soon be switching to INADDR_ANY: permit address reuse */ + if (ret && setsockopt(fd, SOL_SOCKET, SO_REUSEADDR, &enable, sizeof(enable)) == 0) + TRACE("Socket %04lx bound to interface index %d\n", s, adapter->Index); + else + ret = FALSE; + +cleanup: + if(!ret) + ERR("Failed to bind to interface, receiving broadcast packets will not work on socket %04lx.\n", s); + HeapFree(GetProcessHeap(), 0, adapters); + return ret; +} + +/*********************************************************************** * bind (WS2_32.2) */ int WINAPI WS_bind(SOCKET s, const struct WS_sockaddr* name, int namelen) @@ -2157,6 +2219,8 @@ int WINAPI WS_bind(SOCKET s, const struct WS_sockaddr* name, int namelen) "INADDR_ANY instead.\n"); in4->sin_addr.s_addr = htonl(WS_INADDR_ANY); } + else if (interface_bind(s, fd, &uaddr.addr)) + in4->sin_addr.s_addr = htonl(WS_INADDR_ANY); } if (bind(fd, &uaddr.addr, uaddrlen) < 0) {

1 0

Erich Hoover : ws2_32: Permit broadcast packets on interface-bound sockets for systems with IP_UNICAST_IF and SO_ATTACH_FILTER .
by Alexandre Julliard 02 Oct '12

02 Oct '12

Module: wine Branch: master Commit: 57019615b51378187b9a09be55e262dc664cfc4f URL: http://source.winehq.org/git/wine.git/?a=commit;h=57019615b51378187b9a09be5… Author: Erich Hoover <ehoover(a)mines.edu> Date: Wed Sep 26 16:38:29 2012 -0600 ws2_32: Permit broadcast packets on interface-bound sockets for systems with IP_UNICAST_IF and SO_ATTACH_FILTER. --- configure | 1 + configure.ac | 1 + dlls/ws2_32/socket.c | 38 ++++++++++++++++++++++++++++++++++++++ include/config.h.in | 3 +++ 4 files changed, 43 insertions(+), 0 deletions(-) diff --git a/configure b/configure index 54675b4..2be377a 100755 --- a/configure +++ b/configure @@ -5848,6 +5848,7 @@ for ac_header in \ link.h \ linux/cdrom.h \ linux/compiler.h \ + linux/filter.h \ linux/hdreg.h \ linux/input.h \ linux/ioctl.h \ diff --git a/configure.ac b/configure.ac index 79b1175..eb57696 100644 --- a/configure.ac +++ b/configure.ac @@ -443,6 +443,7 @@ AC_CHECK_HEADERS(\ link.h \ linux/cdrom.h \ linux/compiler.h \ + linux/filter.h \ linux/hdreg.h \ linux/input.h \ linux/ioctl.h \ diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index d645872..8efa1e6 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -92,6 +92,9 @@ #ifdef HAVE_NET_IF_H # include <net/if.h> #endif +#ifdef HAVE_LINUX_FILTER_H +# include <linux/filter.h> +#endif #ifdef HAVE_NETIPX_IPX_H # include <netipx/ipx.h> @@ -167,6 +170,27 @@ WINE_DEFAULT_DEBUG_CHANNEL(winsock); WINE_DECLARE_DEBUG_CHANNEL(winediag); +#if defined(IP_UNICAST_IF) && defined(SO_ATTACH_FILTER) +# define LINUX_BOUND_IF +struct interface_filter { + struct sock_filter iface_memaddr; + struct sock_filter iface_rule; + struct sock_filter return_keep; + struct sock_filter return_dump; +}; +# define FILTER_JUMP_DUMP(here) (u_char)(offsetof(struct interface_filter, return_dump) \ + -offsetof(struct interface_filter, here)-sizeof(struct sock_filter)) \ + /sizeof(struct sock_filter) +# define FILTER_JUMP_KEEP(here) (u_char)(offsetof(struct interface_filter, return_keep) \ + -offsetof(struct interface_filter, here)-sizeof(struct sock_filter)) \ + /sizeof(struct sock_filter) +static struct interface_filter generic_interface_filter = { + BPF_STMT(BPF_LD+BPF_W+BPF_ABS, SKF_AD_OFF+SKF_AD_IFINDEX), + BPF_JUMP(BPF_JMP+BPF_JEQ+BPF_K, 0xdeadbeef, FILTER_JUMP_KEEP(iface_rule), FILTER_JUMP_DUMP(iface_rule)), + BPF_STMT(BPF_RET+BPF_K, (u_int)-1), /* keep packet */ + BPF_STMT(BPF_RET+BPF_K, 0) /* dump packet */ +}; +#endif /* LINUX_BOUND_IF */ /* * The actual definition of WSASendTo, wrapped in a different function name @@ -2148,6 +2172,20 @@ static BOOL interface_bind( SOCKET s, int fd, struct sockaddr *addr ) if (setsockopt(fd, IPPROTO_IP, IP_BOUND_IF, &adapter->Index, sizeof(adapter->Index)) != 0) goto cleanup; ret = TRUE; +#elif defined(LINUX_BOUND_IF) + in_addr_t ifindex = (in_addr_t) htonl(adapter->Index); + struct interface_filter specific_interface_filter; + struct sock_fprog filter_prog; + + if (setsockopt(fd, IPPROTO_IP, IP_UNICAST_IF, &ifindex, sizeof(ifindex)) != 0) + goto cleanup; /* Failed to suggest egress interface */ + memcpy(&specific_interface_filter, &generic_interface_filter, sizeof(generic_interface_filter)); + specific_interface_filter.iface_rule.k = adapter->Index; + filter_prog.len = sizeof(generic_interface_filter)/sizeof(struct sock_filter); + filter_prog.filter = (struct sock_filter *) &specific_interface_filter; + if (setsockopt(fd, SOL_SOCKET, SO_ATTACH_FILTER, &filter_prog, sizeof(filter_prog)) != 0) + goto cleanup; /* Failed to specify incoming packet filter */ + ret = TRUE; #else FIXME("Broadcast packets on interface-bound sockets are not currently supported on this platform, " "receiving broadcast packets will not work on socket %04lx.\n", s); diff --git a/include/config.h.in b/include/config.h.in index c1f29bc..67f4fe4 100644 --- a/include/config.h.in +++ b/include/config.h.in @@ -392,6 +392,9 @@ /* Define to 1 if you have the <linux/compiler.h> header file. */ #undef HAVE_LINUX_COMPILER_H +/* Define to 1 if you have the <linux/filter.h> header file. */ +#undef HAVE_LINUX_FILTER_H + /* Define if Linux-style gethostbyname_r and gethostbyaddr_r are available */ #undef HAVE_LINUX_GETHOSTBYNAME_R_6

1 0

Christian Costa : ntoskrnl.exe: Add stub for IoAcquireCancelSpinLock and IoReleaseCancelSpinLock.
by Alexandre Julliard 02 Oct '12

02 Oct '12

Module: wine Branch: master Commit: 84465b420b43231887bb87eafab4ec5beb4c13ce URL: http://source.winehq.org/git/wine.git/?a=commit;h=84465b420b43231887bb87eaf… Author: Christian Costa <titan.costa(a)gmail.com> Date: Tue Oct 2 06:36:52 2012 +0200 ntoskrnl.exe: Add stub for IoAcquireCancelSpinLock and IoReleaseCancelSpinLock. --- dlls/ntoskrnl.exe/ntoskrnl.c | 18 ++++++++++++++++++ dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 4 ++-- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index c66bb55..2cf7983 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -284,6 +284,24 @@ NTSTATUS CDECL wine_ntoskrnl_main_loop( HANDLE stop_event ) /*********************************************************************** + * IoAcquireCancelSpinLock (NTOSKRNL.EXE.@) + */ +void WINAPI IoAcquireCancelSpinLock(PKIRQL irql) +{ + FIXME("(%p): stub\n", irql); +} + + +/*********************************************************************** + * IoReleaseCancelSpinLock (NTOSKRNL.EXE.@) + */ +void WINAPI IoReleaseCancelSpinLock(PKIRQL irql) +{ + FIXME("(%p): stub\n", irql); +} + + +/*********************************************************************** * IoAllocateDriverObjectExtension (NTOSKRNL.EXE.@) */ NTSTATUS WINAPI IoAllocateDriverObjectExtension( PDRIVER_OBJECT DriverObject, diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec index 561c8e1..3a871de 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec +++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec @@ -303,7 +303,7 @@ @ stub InbvSetTextColor @ stub InbvSolidColorFill @ stub InitSafeBootMode -@ stub IoAcquireCancelSpinLock +@ stdcall IoAcquireCancelSpinLock(ptr) @ stub IoAcquireRemoveLockEx @ stub IoAcquireVpbSpinLock @ stub IoAdapterObjectType @@ -432,7 +432,7 @@ @ stub IoRegisterLastChanceShutdownNotification @ stub IoRegisterPlugPlayNotification @ stdcall IoRegisterShutdownNotification(ptr) -@ stub IoReleaseCancelSpinLock +@ stdcall IoReleaseCancelSpinLock(ptr) @ stub IoReleaseRemoveLockAndWaitEx @ stub IoReleaseRemoveLockEx @ stub IoReleaseVpbSpinLock

1 0

Christian Costa : scsiport.sys: Add stub implementation of scsiport.sys.
by Alexandre Julliard 02 Oct '12

02 Oct '12

Module: wine Branch: master Commit: ce44d1e506dd647f55366932a4215d182391b96a URL: http://source.winehq.org/git/wine.git/?a=commit;h=ce44d1e506dd647f55366932a… Author: Christian Costa <titan.costa(a)gmail.com> Date: Tue Oct 2 06:23:49 2012 +0200 scsiport.sys: Add stub implementation of scsiport.sys. --- configure | 1 + configure.ac | 1 + dlls/scsiport.sys/Makefile.in | 8 ++++++ dlls/scsiport.sys/scsiport.c | 39 ++++++++++++++++++++++++++++ dlls/scsiport.sys/scsiport.sys.spec | 48 +++++++++++++++++++++++++++++++++++ 5 files changed, 97 insertions(+), 0 deletions(-) diff --git a/configure b/configure index 2be377a..d18cc0e 100755 --- a/configure +++ b/configure @@ -15663,6 +15663,7 @@ wine_fn_config_dll schannel enable_schannel wine_fn_config_test dlls/schannel/tests schannel_test wine_fn_config_dll scrrun enable_scrrun wine_fn_config_test dlls/scrrun/tests scrrun_test +wine_fn_config_dll scsiport.sys enable_scsiport_sys wine_fn_config_dll secur32 enable_secur32 implib wine_fn_config_test dlls/secur32/tests secur32_test wine_fn_config_dll security enable_security diff --git a/configure.ac b/configure.ac index eb57696..5c7e9a2 100644 --- a/configure.ac +++ b/configure.ac @@ -2936,6 +2936,7 @@ WINE_CONFIG_DLL(schannel) WINE_CONFIG_TEST(dlls/schannel/tests) WINE_CONFIG_DLL(scrrun) WINE_CONFIG_TEST(dlls/scrrun/tests) +WINE_CONFIG_DLL(scsiport.sys) WINE_CONFIG_DLL(secur32,,[implib]) WINE_CONFIG_TEST(dlls/secur32/tests) WINE_CONFIG_DLL(security) diff --git a/dlls/scsiport.sys/Makefile.in b/dlls/scsiport.sys/Makefile.in new file mode 100644 index 0000000..40c3b62 --- /dev/null +++ b/dlls/scsiport.sys/Makefile.in @@ -0,0 +1,8 @@ +MODULE = scsiport.sys +IMPORTS = ntoskrnl.exe +EXTRADLLFLAGS = -Wb,--subsystem,native + +C_SRCS = \ + scsiport.c + +(a)MAKE_DLL_RULES@ diff --git a/dlls/scsiport.sys/scsiport.c b/dlls/scsiport.sys/scsiport.c new file mode 100644 index 0000000..f689153 --- /dev/null +++ b/dlls/scsiport.sys/scsiport.c @@ -0,0 +1,39 @@ +/* + * Copyright (C) 2012 Christian Costa + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA + */ + +#include <stdarg.h> + +#define NONAMELESSUNION +#define NONAMELESSSTRUCT + +#include "ntstatus.h" +#define WIN32_NO_STATUS +#include "windef.h" +#include "winbase.h" +#include "winternl.h" +#include "ddk/wdm.h" +#include "wine/debug.h" + +WINE_DEFAULT_DEBUG_CHANNEL(scsiport); + +NTSTATUS WINAPI DriverEntry(DRIVER_OBJECT *driver, UNICODE_STRING *path) +{ + TRACE("(%p, %s)\n", driver, debugstr_w(path->Buffer)); + + return STATUS_SUCCESS; +} diff --git a/dlls/scsiport.sys/scsiport.sys.spec b/dlls/scsiport.sys/scsiport.sys.spec new file mode 100644 index 0000000..55a373e --- /dev/null +++ b/dlls/scsiport.sys/scsiport.sys.spec @@ -0,0 +1,48 @@ +@ stub DllInitialize +@ stub PortNotification +@ stub ScsiDebugPrint +@ stub ScsiPortCompleteRequest +@ stub ScsiPortConvertPhysicalAddressToUlong +@ stub ScsiPortConvertUlongToPhysicalAddress +@ stub ScsiPortFlushDma +@ stub ScsiPortFreeDeviceBase +@ stub ScsiPortGetBusData +@ stub ScsiPortGetDeviceBase +@ stub ScsiPortGetLogicalUnit +@ stub ScsiPortGetPhysicalAddress +@ stub ScsiPortGetSrb +@ stub ScsiPortGetUncachedExtension +@ stub ScsiPortGetVirtualAddress +@ stub ScsiPortInitialize +@ stub ScsiPortIoMapTransfer +@ stub ScsiPortLogError +@ stub ScsiPortMoveMemory +@ stub ScsiPortNotification +@ stub ScsiPortQuerySystemTime +@ stub ScsiPortReadPortBufferUchar +@ stub ScsiPortReadPortBufferUlong +@ stub ScsiPortReadPortBufferUshort +@ stub ScsiPortReadPortUchar +@ stub ScsiPortReadPortUlong +@ stub ScsiPortReadPortUshort +@ stub ScsiPortReadRegisterBufferUchar +@ stub ScsiPortReadRegisterBufferUlong +@ stub ScsiPortReadRegisterBufferUshort +@ stub ScsiPortReadRegisterUchar +@ stub ScsiPortReadRegisterUlong +@ stub ScsiPortReadRegisterUshort +@ stub ScsiPortSetBusDataByOffset +@ stub ScsiPortStallExecution +@ stub ScsiPortValidateRange +@ stub ScsiPortWritePortBufferUchar +@ stub ScsiPortWritePortBufferUlong +@ stub ScsiPortWritePortBufferUshort +@ stub ScsiPortWritePortUchar +@ stub ScsiPortWritePortUlong +@ stub ScsiPortWritePortUshort +@ stub ScsiPortWriteRegisterBufferUchar +@ stub ScsiPortWriteRegisterBufferUlong +@ stub ScsiPortWriteRegisterBufferUshort +@ stub ScsiPortWriteRegisterUchar +@ stub ScsiPortWriteRegisterUlong +@ stub ScsiPortWriteRegisterUshort

1 0

Christian Costa : ntoskrnl.exe: Implement IoAllocateMdl.
by Alexandre Julliard 02 Oct '12

02 Oct '12

Module: wine Branch: master Commit: 5c65471681cad45c21fd80b8bb243590dc032470 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5c65471681cad45c21fd80b8b… Author: Christian Costa <titan.costa(a)gmail.com> Date: Tue Oct 2 00:09:51 2012 +0200 ntoskrnl.exe: Implement IoAllocateMdl. --- dlls/ntoskrnl.exe/ntoskrnl.c | 25 +++++++++++++++++++++++-- 1 files changed, 23 insertions(+), 2 deletions(-) diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c index 2cf7983..ba2034d 100644 --- a/dlls/ntoskrnl.exe/ntoskrnl.c +++ b/dlls/ntoskrnl.exe/ntoskrnl.c @@ -415,13 +415,34 @@ PVOID WINAPI IoAllocateErrorLogEntry( PVOID IoObject, UCHAR EntrySize ) PMDL WINAPI IoAllocateMdl( PVOID VirtualAddress, ULONG Length, BOOLEAN SecondaryBuffer, BOOLEAN ChargeQuota, PIRP Irp ) { PMDL mdl; + ULONG_PTR address = (ULONG_PTR)VirtualAddress; + ULONG_PTR page_address; + SIZE_T nb_pages, mdl_size; - FIXME("partial stub: %p, %u, %i, %i, %p\n", VirtualAddress, Length, SecondaryBuffer, ChargeQuota, Irp); + TRACE("(%p, %u, %i, %i, %p)\n", VirtualAddress, Length, SecondaryBuffer, ChargeQuota, Irp); - mdl = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(MDL)); + if (Irp) + FIXME("Attaching the MDL to an IRP is not yet supported\n"); + + if (ChargeQuota) + FIXME("Charge quota is not yet supported\n"); + + /* FIXME: We suppose that page size is 4096 */ + page_address = address & ~(4096 - 1); + nb_pages = (((address + Length - 1) & ~(4096 - 1)) - page_address) / 4096 + 1; + + mdl_size = sizeof(MDL) + nb_pages * sizeof(PVOID); + + mdl = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, mdl_size); if (!mdl) return NULL; + mdl->Size = mdl_size; + mdl->Process = IoGetCurrentProcess(); + mdl->StartVa = (PVOID)page_address; + mdl->ByteCount = Length; + mdl->ByteOffset = address - page_address; + return mdl; }

1 0