wine-commits October 2012

wine-commits@winehq.org

2 participants
960 discussions

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

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

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: 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: 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: 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

Nikolay Sivov : mshtml: Implement IHTMLFrameBase_put_name().
by Alexandre Julliard 02 Oct '12

02 Oct '12

Module: wine Branch: master Commit: 1075118cdbdc261011bf3af46dd21101f0f42ace URL: http://source.winehq.org/git/wine.git/?a=commit;h=1075118cdbdc261011bf3af46… Author: Nikolay Sivov <nsivov(a)codeweavers.com> Date: Mon Oct 1 15:06:32 2012 +0400 mshtml: Implement IHTMLFrameBase_put_name(). --- dlls/mshtml/htmlframebase.c | 24 ++++++++++++++++++++++-- dlls/mshtml/tests/dom.c | 25 ++++++++++++++++++++++++- 2 files changed, 46 insertions(+), 3 deletions(-) diff --git a/dlls/mshtml/htmlframebase.c b/dlls/mshtml/htmlframebase.c index 55a56db..acb493a 100644 --- a/dlls/mshtml/htmlframebase.c +++ b/dlls/mshtml/htmlframebase.c @@ -148,8 +148,28 @@ static HRESULT WINAPI HTMLFrameBase_get_src(IHTMLFrameBase *iface, BSTR *p) static HRESULT WINAPI HTMLFrameBase_put_name(IHTMLFrameBase *iface, BSTR v) { HTMLFrameBase *This = impl_from_IHTMLFrameBase(iface); - FIXME("(%p)->(%s)\n", This, debugstr_w(v)); - return E_NOTIMPL; + nsAString name_str; + nsresult nsres; + + TRACE("(%p)->(%s)\n", This, debugstr_w(v)); + + if(!This->nsframe && !This->nsiframe) { + ERR("No attached ns frame object\n"); + return E_UNEXPECTED; + } + + nsAString_InitDepend(&name_str, v); + if(This->nsframe) + nsres = nsIDOMHTMLFrameElement_SetName(This->nsframe, &name_str); + else + nsres = nsIDOMHTMLIFrameElement_SetName(This->nsiframe, &name_str); + nsAString_Finish(&name_str); + if(NS_FAILED(nsres)) { + ERR("SetName failed: %08x\n", nsres); + return E_FAIL; + } + + return S_OK; } static HRESULT WINAPI HTMLFrameBase_get_name(IHTMLFrameBase *iface, BSTR *p) diff --git a/dlls/mshtml/tests/dom.c b/dlls/mshtml/tests/dom.c index d6fbd64..08ea83e7 100644 --- a/dlls/mshtml/tests/dom.c +++ b/dlls/mshtml/tests/dom.c @@ -4227,6 +4227,25 @@ static void _test_framebase_name(unsigned line, IHTMLElement *elem, const char * IHTMLFrameBase_Release(fbase); } +#define test_framebase_put_name(a,b) _test_framebase_put_name(__LINE__,a,b) +static void _test_framebase_put_name(unsigned line, IHTMLElement *elem, const char *name) +{ + IHTMLFrameBase *fbase; + HRESULT hres; + BSTR str; + + hres = IHTMLElement_QueryInterface(elem, &IID_IHTMLFrameBase, (void**)&fbase); + ok(hres == S_OK, "Could not get IHTMLFrameBase interface: 0x%08x\n", hres); + + str = name ? a2bstr(name) : NULL; + hres = IHTMLFrameBase_put_name(fbase, str); + ok_(__FILE__,line)(hres == S_OK, "put_name failed: %08x\n", hres); + SysFreeString(str); + + _test_framebase_name(line, elem, name); + IHTMLFrameBase_Release(fbase); +} + static void test_framebase(IUnknown *unk) { IHTMLFrameBase *fbase; @@ -6273,12 +6292,16 @@ static void test_frameset(IHTMLDocument2 *doc) test_framebase((IUnknown*)elem); test_framebase_name(elem, "nm1"); - + test_framebase_put_name(elem, "frame name"); + test_framebase_put_name(elem, NULL); + test_framebase_put_name(elem, "nm1"); IHTMLElement_Release(elem); /* get_name with no name attr */ elem = get_doc_elem_by_id(doc, "fr3"); test_framebase_name(elem, NULL); + test_framebase_put_name(elem, "frame name"); + test_framebase_put_name(elem, NULL); IHTMLElement_Release(elem); IHTMLWindow2_Release(window);

1 0

Bruno Jesus : ws2_32: Fix TRACE format in WS_getsockname.
by Alexandre Julliard 02 Oct '12

02 Oct '12

Module: wine Branch: master Commit: a82278c3490969c088cf48a345f263f8c30d300b URL: http://source.winehq.org/git/wine.git/?a=commit;h=a82278c3490969c088cf48a34… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Mon Oct 1 00:30:06 2012 -0300 ws2_32: Fix TRACE format in WS_getsockname. --- dlls/ws2_32/socket.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index ca5d0e4..7b86ca4 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -2444,7 +2444,7 @@ int WINAPI WS_getsockname(SOCKET s, struct WS_sockaddr *name, int *namelen) int fd; int res; - TRACE("socket: %04lx, ptr %p, len %8x\n", s, name, *namelen); + TRACE("socket: %04lx, ptr %p, len %08x\n", s, name, namelen?*namelen:0); /* Check if what we've received is valid. Should we use IsBadReadPtr? */ if( (name == NULL) || (namelen == NULL) )

1 0

Dan Kegel : vcomp: Better stub for omp_get_thread_num.
by Alexandre Julliard 02 Oct '12

02 Oct '12

Module: wine Branch: master Commit: d0955b1bd610298ad546300243882be3ed20f8fa URL: http://source.winehq.org/git/wine.git/?a=commit;h=d0955b1bd610298ad54630024… Author: Dan Kegel <dank(a)kegel.com> Date: Sat Sep 29 20:20:41 2012 -0700 vcomp: Better stub for omp_get_thread_num. --- dlls/vcomp/main.c | 6 ++++++ dlls/vcomp/vcomp.spec | 2 +- 2 files changed, 7 insertions(+), 1 deletions(-) diff --git a/dlls/vcomp/main.c b/dlls/vcomp/main.c index b758fbd..5faf0a1 100644 --- a/dlls/vcomp/main.c +++ b/dlls/vcomp/main.c @@ -59,6 +59,12 @@ int CDECL omp_get_num_threads(void) return 1; } +int CDECL omp_get_thread_num(void) +{ + TRACE("stub\n"); + return 0; +} + /* Time in seconds since "some time in the past" */ double CDECL omp_get_wtime(void) { diff --git a/dlls/vcomp/vcomp.spec b/dlls/vcomp/vcomp.spec index 1b58b25..41b57fb 100644 --- a/dlls/vcomp/vcomp.spec +++ b/dlls/vcomp/vcomp.spec @@ -95,7 +95,7 @@ @ cdecl omp_get_nested() @ cdecl omp_get_num_procs() @ cdecl omp_get_num_threads() -@ stub omp_get_thread_num +@ cdecl omp_get_thread_num() @ stub omp_get_wtick @ cdecl omp_get_wtime() @ stub omp_in_parallel

1 0

Dan Kegel : vcomp: Better stubs for omp_get_nested, omp_set_nested.
by Alexandre Julliard 02 Oct '12

02 Oct '12

Module: wine Branch: master Commit: 15b59d75c65457e72ce6f1836edc208c336a3b6f URL: http://source.winehq.org/git/wine.git/?a=commit;h=15b59d75c65457e72ce6f1836… Author: Dan Kegel <dank(a)kegel.com> Date: Sat Sep 29 20:20:40 2012 -0700 vcomp: Better stubs for omp_get_nested, omp_set_nested. --- dlls/vcomp/main.c | 11 +++++++++++ dlls/vcomp/vcomp.spec | 4 ++-- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/dlls/vcomp/main.c b/dlls/vcomp/main.c index 1f80563..b758fbd 100644 --- a/dlls/vcomp/main.c +++ b/dlls/vcomp/main.c @@ -41,6 +41,12 @@ int CDECL omp_get_max_threads(void) return 1; } +int CDECL omp_get_nested(void) +{ + TRACE("stub\n"); + return 0; +} + int CDECL omp_get_num_procs(void) { TRACE("stub\n"); @@ -64,6 +70,11 @@ void CDECL omp_set_dynamic(int val) TRACE("(%d): stub\n", val); } +void CDECL omp_set_nested(int nested) +{ + TRACE("(%d): stub\n", nested); +} + void CDECL omp_set_num_threads(int num_threads) { TRACE("(%d): stub\n", num_threads); diff --git a/dlls/vcomp/vcomp.spec b/dlls/vcomp/vcomp.spec index ce66c52..1b58b25 100644 --- a/dlls/vcomp/vcomp.spec +++ b/dlls/vcomp/vcomp.spec @@ -92,7 +92,7 @@ @ stub omp_destroy_nest_lock @ cdecl omp_get_dynamic() @ cdecl omp_get_max_threads() -@ stub omp_get_nested +@ cdecl omp_get_nested() @ cdecl omp_get_num_procs() @ cdecl omp_get_num_threads() @ stub omp_get_thread_num @@ -104,7 +104,7 @@ @ cdecl omp_set_dynamic(long) @ stub omp_set_lock @ stub omp_set_nest_lock -@ stub omp_set_nested +@ cdecl omp_set_nested(long) @ cdecl omp_set_num_threads(long) @ stub omp_test_lock @ stub omp_test_nest_lock

1 0

← Newer
1
...
86
87
88
89
90
91
92
...
96
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits October 2012