October 2012 - Wine-Commits

Alexandre Julliard : winex11: Take the alpha channel into account to compute the region of layered windows .
by Alexandre Julliard Oct. 2, 2012

Oct. 2, 2012

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 Oct. 2, 2012

Oct. 2, 2012

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 Oct. 2, 2012

Oct. 2, 2012

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 Oct. 2, 2012

Oct. 2, 2012

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

Bruno Jesus : ws2_32: Fix TRACE format in WS_getsockname.
by Alexandre Julliard Oct. 2, 2012

Oct. 2, 2012

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

Jacek Caban : vbscript: Added Trim() implementation.
by Alexandre Julliard Oct. 2, 2012

Oct. 2, 2012

Module: wine Branch: master Commit: 3ea9a170c0beb6c68cef50e3c81c2c883562efce URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ea9a170c0beb6c68cef50e3c… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 2 10:33:30 2012 +0200 vbscript: Added Trim() implementation. --- dlls/vbscript/global.c | 26 ++++++++++++++++++++++++-- dlls/vbscript/tests/api.vbs | 12 ++++++++++++ 2 files changed, 36 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index fa600ee..e6211b7 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -864,8 +864,30 @@ static HRESULT Global_RTrim(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VAR static HRESULT Global_Trim(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) { - FIXME("\n"); - return E_NOTIMPL; + BSTR str, conv_str = NULL; + WCHAR *begin_ptr, *end_ptr; + HRESULT hres; + + TRACE("%s\n", debugstr_variant(arg)); + + if(V_VT(arg) == VT_BSTR) { + str = V_BSTR(arg); + }else { + hres = to_string(arg, &conv_str); + if(FAILED(hres)) + return hres; + str = conv_str; + } + + for(begin_ptr = str; *begin_ptr && isspaceW(*begin_ptr); begin_ptr++); + for(end_ptr = str+SysStringLen(str); end_ptr-1 > begin_ptr && isspaceW(*(end_ptr-1)); end_ptr--); + + str = SysAllocStringLen(begin_ptr, end_ptr-begin_ptr); + SysFreeString(conv_str); + if(!str) + return E_OUTOFMEMORY; + + return return_bstr(res, str); } static HRESULT Global_Space(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs index 06122ef..7553d59 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -225,6 +225,18 @@ TestRight "test", 0, "" TestRight 123, 2, "23" if isEnglishLang then TestRight true, 2, "ue" +Sub TestTrim(str, exstr) + Call ok(Trim(str) = exstr, "Trim(" & str & ") = " & Trim(str)) +End Sub + +TestTrim " test ", "test" +TestTrim "test ", "test" +TestTrim " test", "test" +TestTrim "test", "test" +TestTrim "", "" +TestTrim 123, "123" +if isEnglishLang then TestTrim true, "True" + Sub TestRound(val, exval, vt) Call ok(Round(val) = exval, "Round(" & val & ") = " & Round(val)) Call ok(getVT(Round(val)) = vt, "getVT(Round(" & val & ")) = " & getVT(Round(val)))

1 0

Jacek Caban : vbscript: Added RTrim implementation.
by Alexandre Julliard Oct. 2, 2012

Oct. 2, 2012

Module: wine Branch: master Commit: ed3d0e00aeca051b648af31baa897ff9e0a90776 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ed3d0e00aeca051b648af31ba… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Tue Oct 2 10:34:07 2012 +0200 vbscript: Added RTrim implementation. --- dlls/vbscript/global.c | 25 +++++++++++++++++++++++-- dlls/vbscript/tests/api.vbs | 12 ++++++++++++ 2 files changed, 35 insertions(+), 2 deletions(-) diff --git a/dlls/vbscript/global.c b/dlls/vbscript/global.c index 6db59ca..e2319ae 100644 --- a/dlls/vbscript/global.c +++ b/dlls/vbscript/global.c @@ -879,8 +879,29 @@ static HRESULT Global_LTrim(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VAR static HRESULT Global_RTrim(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) { - FIXME("\n"); - return E_NOTIMPL; + BSTR str, conv_str = NULL; + WCHAR *ptr; + HRESULT hres; + + TRACE("%s\n", debugstr_variant(arg)); + + if(V_VT(arg) == VT_BSTR) { + str = V_BSTR(arg); + }else { + hres = to_string(arg, &conv_str); + if(FAILED(hres)) + return hres; + str = conv_str; + } + + for(ptr = str+SysStringLen(str); ptr-1 > str && isspaceW(*(ptr-1)); ptr--); + + str = SysAllocStringLen(str, ptr-str); + SysFreeString(conv_str); + if(!str) + return E_OUTOFMEMORY; + + return return_bstr(res, str); } static HRESULT Global_Trim(vbdisp_t *This, VARIANT *arg, unsigned args_cnt, VARIANT *res) diff --git a/dlls/vbscript/tests/api.vbs b/dlls/vbscript/tests/api.vbs index b64043d..6bcded8 100644 --- a/dlls/vbscript/tests/api.vbs +++ b/dlls/vbscript/tests/api.vbs @@ -254,6 +254,18 @@ Sub TestRound(val, exval, vt) Call ok(getVT(Round(val)) = vt, "getVT(Round(" & val & ")) = " & getVT(Round(val))) End Sub +Sub TestRTrim(str, exstr) + Call ok(RTrim(str) = exstr, "RTrim(" & str & ") = " & RTrim(str)) +End Sub + +TestRTrim " test ", " test" +TestRTrim "test ", "test" +TestRTrim " test", " test" +TestRTrim "test", "test" +TestRTrim "", "" +TestRTrim 123, "123" +if isEnglishLang then TestRTrim true, "True" + TestRound 3, 3, "VT_I2" TestRound 3.3, 3, "VT_R8" TestRound 3.8, 4, "VT_R8"

1 0

Dan Kegel : vcomp: Better stubs for omp_get_dynamic, omp_set_dynamic.
by Alexandre Julliard Oct. 2, 2012

Oct. 2, 2012

Module: wine Branch: master Commit: d58ade2d4250e32eb3b96131f0fd09bdc1d4ed15 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d58ade2d4250e32eb3b96131f… Author: Dan Kegel <dank(a)kegel.com> Date: Sat Sep 29 20:20:39 2012 -0700 vcomp: Better stubs for omp_get_dynamic, omp_set_dynamic. --- 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 78c2c08..1f80563 100644 --- a/dlls/vcomp/main.c +++ b/dlls/vcomp/main.c @@ -29,6 +29,12 @@ WINE_DEFAULT_DEBUG_CHANNEL(vcomp); +int CDECL omp_get_dynamic(void) +{ + TRACE("stub\n"); + return 0; +} + int CDECL omp_get_max_threads(void) { TRACE("stub\n"); @@ -53,6 +59,11 @@ double CDECL omp_get_wtime(void) return GetTickCount() / 1000.0; } +void CDECL omp_set_dynamic(int val) +{ + TRACE("(%d): stub\n", val); +} + 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 a29b9f9..ce66c52 100644 --- a/dlls/vcomp/vcomp.spec +++ b/dlls/vcomp/vcomp.spec @@ -90,7 +90,7 @@ @ stub _vcomp_single_end @ stub omp_destroy_lock @ stub omp_destroy_nest_lock -@ stub omp_get_dynamic +@ cdecl omp_get_dynamic() @ cdecl omp_get_max_threads() @ stub omp_get_nested @ cdecl omp_get_num_procs() @@ -101,7 +101,7 @@ @ stub omp_in_parallel @ stub omp_init_lock @ stub omp_init_nest_lock -@ stub omp_set_dynamic +@ cdecl omp_set_dynamic(long) @ stub omp_set_lock @ stub omp_set_nest_lock @ stub omp_set_nested

1 0

Dan Kegel : vcomp: Better stubs for omp_get_nested, omp_set_nested.
by Alexandre Julliard Oct. 2, 2012

Oct. 2, 2012

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

Alexandre Julliard : winex11: Don' t put window manager decorations on layered windows.
by Alexandre Julliard Oct. 2, 2012

Oct. 2, 2012

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