September 2013 - Wine-commits

Henri Verbeet : wined3d: Replace surface_modify_location(surface, location, FALSE) calls with surface_invalidate_location().
by Alexandre Julliard 10 Sep '13

10 Sep '13

Module: wine Branch: master Commit: b62915dabb8c009f305d77109bbdbe774b701225 URL: http://source.winehq.org/git/wine.git/?a=commit;h=b62915dabb8c009f305d77109… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Sep 10 09:32:33 2013 +0200 wined3d: Replace surface_modify_location(surface, location, FALSE) calls with surface_invalidate_location(). --- dlls/wined3d/context.c | 2 +- dlls/wined3d/surface.c | 14 ++++++-------- dlls/wined3d/swapchain.c | 2 +- dlls/wined3d/wined3d_private.h | 1 + 4 files changed, 9 insertions(+), 10 deletions(-) diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index 4a079cf..026158d 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -2453,7 +2453,7 @@ static void context_setup_target(struct wined3d_context *context, struct wined3d if (context->current_rt->texture_name_srgb) surface_internal_preload(context->current_rt, SRGB_SRGB); surface_internal_preload(context->current_rt, SRGB_RGB); - surface_modify_location(context->current_rt, SFLAG_INDRAWABLE, FALSE); + surface_invalidate_location(context->current_rt, SFLAG_INDRAWABLE); } } diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index ee404c1..01035b4 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -605,7 +605,7 @@ static void surface_evict_sysmem(struct wined3d_surface *surface) wined3d_resource_free_sysmem(surface->resource.heap_memory); surface->resource.allocatedMemory = NULL; surface->resource.heap_memory = NULL; - surface_modify_location(surface, SFLAG_INSYSMEM, FALSE); + surface_invalidate_location(surface, SFLAG_INSYSMEM); } /* Context activation is done by the caller. */ @@ -703,8 +703,7 @@ static void surface_release_client_storage(struct wined3d_surface *surface) context_release(context); - surface_modify_location(surface, SFLAG_INSRGBTEX, FALSE); - surface_modify_location(surface, SFLAG_INTEXTURE, FALSE); + surface_invalidate_location(surface, SFLAG_INTEXTURE | SFLAG_INSRGBTEX); surface_force_reload(surface); } @@ -818,7 +817,7 @@ static void surface_realize_palette(struct wined3d_surface *surface) /* We want to force a palette refresh, so mark the drawable as not being up to date */ if (!surface_is_offscreen(surface)) - surface_modify_location(surface, SFLAG_INDRAWABLE, FALSE); + surface_invalidate_location(surface, SFLAG_INDRAWABLE); } else { @@ -1528,10 +1527,9 @@ static void surface_unload(struct wined3d_resource *resource) { /* Load the surface into system memory */ surface_load_location(surface, SFLAG_INSYSMEM, NULL); - surface_modify_location(surface, surface->draw_binding, FALSE); + surface_invalidate_location(surface, surface->draw_binding); } - surface_modify_location(surface, SFLAG_INTEXTURE, FALSE); - surface_modify_location(surface, SFLAG_INSRGBTEX, FALSE); + surface_invalidate_location(surface, SFLAG_INTEXTURE | SFLAG_INSRGBTEX); surface->flags &= ~(SFLAG_ALLOCATED | SFLAG_SRGBALLOCATED); context = context_acquire(device, NULL); @@ -5347,7 +5345,7 @@ static void surface_validate_location(struct wined3d_surface *surface, DWORD loc } } -static void surface_invalidate_location(struct wined3d_surface *surface, DWORD location) +void surface_invalidate_location(struct wined3d_surface *surface, DWORD location) { TRACE("surface %p, location %s.\n", surface, debug_surflocation(location & SFLAG_LOCATIONS)); diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c index 981d946..48917fd 100644 --- a/dlls/wined3d/swapchain.c +++ b/dlls/wined3d/swapchain.c @@ -521,7 +521,7 @@ static void swapchain_gl_present(struct wined3d_swapchain *swapchain, const RECT if (!swapchain->render_to_fbo && render_to_fbo && wined3d_settings.offscreen_rendering_mode == ORM_FBO) { surface_load_location(back_buffer, SFLAG_INTEXTURE, NULL); - surface_modify_location(back_buffer, SFLAG_INDRAWABLE, FALSE); + surface_invalidate_location(back_buffer, SFLAG_INDRAWABLE); swapchain->render_to_fbo = TRUE; swapchain_update_draw_bindings(swapchain); } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 3fbad8b..06e17f3 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2253,6 +2253,7 @@ HRESULT surface_color_fill(struct wined3d_surface *s, const RECT *rect, const struct wined3d_color *color) DECLSPEC_HIDDEN; GLenum surface_get_gl_buffer(const struct wined3d_surface *surface) DECLSPEC_HIDDEN; void surface_internal_preload(struct wined3d_surface *surface, enum WINED3DSRGB srgb) DECLSPEC_HIDDEN; +void surface_invalidate_location(struct wined3d_surface *surface, DWORD location) DECLSPEC_HIDDEN; BOOL surface_is_offscreen(const struct wined3d_surface *surface) DECLSPEC_HIDDEN; HRESULT surface_load(struct wined3d_surface *surface, BOOL srgb) DECLSPEC_HIDDEN; void surface_load_ds_location(struct wined3d_surface *surface,

1 0

Henri Verbeet : wined3d: Get rid of surface_modify_location().
by Alexandre Julliard 10 Sep '13

10 Sep '13

Module: wine Branch: master Commit: d21c26e4f6e59ce7ba8a808392afdc7ba964c19a URL: http://source.winehq.org/git/wine.git/?a=commit;h=d21c26e4f6e59ce7ba8a80839… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Sep 10 09:32:34 2013 +0200 wined3d: Get rid of surface_modify_location(). --- dlls/wined3d/arb_program_shader.c | 4 +- dlls/wined3d/device.c | 5 ++- dlls/wined3d/drawprim.c | 2 +- dlls/wined3d/surface.c | 76 +++++++++++++++--------------------- dlls/wined3d/swapchain.c | 24 +++++++---- dlls/wined3d/wined3d_private.h | 2 +- 6 files changed, 56 insertions(+), 57 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=d21c26e4f6e59ce7ba8a8…

1 0

Henri Verbeet : d3drm: Avoid LPDWORD.
by Alexandre Julliard 10 Sep '13

10 Sep '13

Module: wine Branch: master Commit: 39991e759a45760269ece936408cbd241a1a7c53 URL: http://source.winehq.org/git/wine.git/?a=commit;h=39991e759a45760269ece9364… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Sep 10 09:32:35 2013 +0200 d3drm: Avoid LPDWORD. --- dlls/d3drm/d3drm.c | 13 ++++--------- dlls/d3drm/device.c | 10 ++++------ dlls/d3drm/frame.c | 14 ++++---------- dlls/d3drm/texture.c | 7 +++---- include/d3drm.h | 4 ++-- include/d3drmobj.h | 22 +++++++++++----------- 6 files changed, 28 insertions(+), 42 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=39991e759a45760269ece…

1 0

Henri Verbeet : d3drm: Avoid LPRECT.
by Alexandre Julliard 10 Sep '13

10 Sep '13

Module: wine Branch: master Commit: 4b772c2cf2ba5fd4c43d35310c6cd1bc62e24a77 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b772c2cf2ba5fd4c43d35310… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Sep 10 09:32:36 2013 +0200 d3drm: Avoid LPRECT. --- dlls/d3drm/texture.c | 7 +++---- include/d3drmobj.h | 2 +- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/d3drm/texture.c b/dlls/d3drm/texture.c index b2ea078..5ed2ad0 100644 --- a/dlls/d3drm/texture.c +++ b/dlls/d3drm/texture.c @@ -565,11 +565,10 @@ static HRESULT WINAPI IDirect3DRMTexture3Impl_InitFromResource(IDirect3DRMTextur return E_NOTIMPL; } -static HRESULT WINAPI IDirect3DRMTexture3Impl_Changed(IDirect3DRMTexture3* iface, DWORD flags, DWORD nb_rects, LPRECT rects) +static HRESULT WINAPI IDirect3DRMTexture3Impl_Changed(IDirect3DRMTexture3 *iface, + DWORD flags, DWORD rect_count, RECT *rects) { - IDirect3DRMTextureImpl *This = impl_from_IDirect3DRMTexture3(iface); - - FIXME("(%p/%p)->(%x, %u, %p): stub\n", iface, This, flags, nb_rects, rects); + FIXME("iface %p, flags %#x, rect_count %u, rects %p stub!\n", iface, flags, rect_count, rects); return E_NOTIMPL; } diff --git a/include/d3drmobj.h b/include/d3drmobj.h index d9de5c3..89198f8 100644 --- a/include/d3drmobj.h +++ b/include/d3drmobj.h @@ -3442,7 +3442,7 @@ DECLARE_INTERFACE_(IDirect3DRMTexture3, IDirect3DRMVisual) STDMETHOD(InitFromFile)(THIS_ const char *filename) PURE; STDMETHOD(InitFromSurface)(THIS_ IDirectDrawSurface *surface) PURE; STDMETHOD(InitFromResource)(THIS_ HRSRC) PURE; - STDMETHOD(Changed)(THIS_ DWORD dwFlags, DWORD dwcRects, LPRECT pRects) PURE; + STDMETHOD(Changed)(THIS_ DWORD flags, DWORD rect_count, RECT *rects) PURE; STDMETHOD(SetColors)(THIS_ DWORD) PURE; STDMETHOD(SetShades)(THIS_ DWORD) PURE; STDMETHOD(SetDecalSize)(THIS_ D3DVALUE width, D3DVALUE height) PURE;

1 0

Dmitry Timoshkov : server: Add a serial event mask change counter.
by Alexandre Julliard 10 Sep '13

10 Sep '13

Module: wine Branch: master Commit: f031c676c1eb5c58810ef22c6c3da54fbe22d660 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f031c676c1eb5c58810ef22c6… Author: Dmitry Timoshkov <dmitry(a)baikal.ru> Date: Tue Sep 10 11:29:57 2013 +0900 server: Add a serial event mask change counter. --- dlls/kernel32/tests/comm.c | 6 ++---- dlls/ntdll/serial.c | 18 +++++++++++------- include/wine/server_protocol.h | 4 +++- server/protocol.def | 1 + server/request.h | 3 ++- server/serial.c | 9 +++++---- server/trace.c | 1 + 7 files changed, 25 insertions(+), 17 deletions(-) diff --git a/dlls/kernel32/tests/comm.c b/dlls/kernel32/tests/comm.c index e54be7a..7646766 100644 --- a/dlls/kernel32/tests/comm.c +++ b/dlls/kernel32/tests/comm.c @@ -860,8 +860,7 @@ todo_wine { /* unblock pending wait */ trace("recovering after WAIT_TIMEOUT...\n"); - /* FIXME: Wine fails to unblock with new mask being equal to the old one */ - res = SetCommMask(hcom, 0); + res = SetCommMask(hcom, EV_TXEMPTY); ok(res, "SetCommMask error %d\n", GetLastError()); res = WaitForSingleObject(ovl_wait.hEvent, TIMEOUT); @@ -968,8 +967,7 @@ todo_wine /* unblock pending wait */ trace("recovering after WAIT_TIMEOUT...\n"); - /* FIXME: Wine fails to unblock with new mask being equal to the old one */ - res = SetCommMask(hcom, 0); + res = SetCommMask(hcom, EV_TXEMPTY); ok(res, "SetCommMask error %d\n", GetLastError()); res = WaitForSingleObject(ovl_wait.hEvent, TIMEOUT); diff --git a/dlls/ntdll/serial.c b/dlls/ntdll/serial.c index 07ba633..5e6eaf4 100644 --- a/dlls/ntdll/serial.c +++ b/dlls/ntdll/serial.c @@ -380,7 +380,7 @@ static NTSTATUS get_timeouts(HANDLE handle, SERIAL_TIMEOUTS* st) return status; } -static NTSTATUS get_wait_mask(HANDLE hDevice, DWORD* mask) +static NTSTATUS get_wait_mask(HANDLE hDevice, DWORD *mask, DWORD *cookie) { NTSTATUS status; @@ -388,7 +388,10 @@ static NTSTATUS get_wait_mask(HANDLE hDevice, DWORD* mask) { req->handle = wine_server_obj_handle( hDevice ); if (!(status = wine_server_call( req ))) + { *mask = reply->eventmask; + if (cookie) *cookie = reply->cookie; + } } SERVER_END_REQ; return status; @@ -794,6 +797,7 @@ typedef struct async_commio IO_STATUS_BLOCK* iosb; HANDLE hEvent; DWORD evtmask; + DWORD cookie; DWORD mstat; serial_irq_info irq_info; } async_commio; @@ -906,9 +910,9 @@ static DWORD CALLBACK wait_for_event(LPVOID arg) if (!server_get_unix_fd( commio->hDevice, FILE_READ_DATA | FILE_WRITE_DATA, &fd, &needs_close, NULL, NULL )) { serial_irq_info new_irq_info; - DWORD new_mstat, new_evtmask; + DWORD new_mstat, dummy, cookie; LARGE_INTEGER time; - + TRACE("device=%p fd=0x%08x mask=0x%08x buffer=%p event=%p irq_info=%p\n", commio->hDevice, fd, commio->evtmask, commio->events, commio->hEvent, &commio->irq_info); @@ -934,8 +938,8 @@ static DWORD CALLBACK wait_for_event(LPVOID arg) &new_irq_info, &commio->irq_info, new_mstat, commio->mstat); if (*commio->events) break; - get_wait_mask(commio->hDevice, &new_evtmask); - if (commio->evtmask != new_evtmask) + get_wait_mask(commio->hDevice, &dummy, &cookie); + if (commio->cookie != cookie) { *commio->events = 0; break; @@ -964,7 +968,7 @@ static NTSTATUS wait_on(HANDLE hDevice, int fd, HANDLE hEvent, PIO_STATUS_BLOCK commio->events = events; commio->iosb = piosb; commio->hEvent = hEvent; - get_wait_mask(commio->hDevice, &commio->evtmask); + get_wait_mask(commio->hDevice, &commio->evtmask, &commio->cookie); /* We may never return, if some capabilities miss * Return error in that case @@ -1159,7 +1163,7 @@ static inline NTSTATUS io_control(HANDLE hDevice, case IOCTL_SERIAL_GET_WAIT_MASK: if (lpOutBuffer && nOutBufferSize == sizeof(DWORD)) { - if (!(status = get_wait_mask(hDevice, lpOutBuffer))) + if (!(status = get_wait_mask(hDevice, lpOutBuffer, NULL))) sz = sizeof(DWORD); } else diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index 4919579..b98e6d8 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -3055,6 +3055,8 @@ struct get_serial_info_reply unsigned int writeconst; unsigned int writemult; unsigned int eventmask; + unsigned int cookie; + char __pad_36[4]; }; @@ -5821,6 +5823,6 @@ union generic_reply struct set_suspend_context_reply set_suspend_context_reply; }; -#define SERVER_PROTOCOL_VERSION 448 +#define SERVER_PROTOCOL_VERSION 449 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/protocol.def b/server/protocol.def index 9164e3e..a7c5478 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -2219,6 +2219,7 @@ enum message_type unsigned int writeconst; unsigned int writemult; unsigned int eventmask; + unsigned int cookie; @END diff --git a/server/request.h b/server/request.h index e6e2c40..12b609c 100644 --- a/server/request.h +++ b/server/request.h @@ -1477,7 +1477,8 @@ C_ASSERT( FIELD_OFFSET(struct get_serial_info_reply, readmult) == 16 ); C_ASSERT( FIELD_OFFSET(struct get_serial_info_reply, writeconst) == 20 ); C_ASSERT( FIELD_OFFSET(struct get_serial_info_reply, writemult) == 24 ); C_ASSERT( FIELD_OFFSET(struct get_serial_info_reply, eventmask) == 28 ); -C_ASSERT( sizeof(struct get_serial_info_reply) == 32 ); +C_ASSERT( FIELD_OFFSET(struct get_serial_info_reply, cookie) == 32 ); +C_ASSERT( sizeof(struct get_serial_info_reply) == 40 ); C_ASSERT( FIELD_OFFSET(struct set_serial_info_request, handle) == 12 ); C_ASSERT( FIELD_OFFSET(struct set_serial_info_request, flags) == 16 ); C_ASSERT( FIELD_OFFSET(struct set_serial_info_request, readinterval) == 20 ); diff --git a/server/serial.c b/server/serial.c index aac20fa..28f17f4 100644 --- a/server/serial.c +++ b/server/serial.c @@ -76,6 +76,7 @@ struct serial unsigned int writemult; unsigned int eventmask; + unsigned int generation; /* event mask change counter */ struct termios original; @@ -135,6 +136,7 @@ struct object *create_serial( struct fd *fd ) serial->writemult = 0; serial->writeconst = 0; serial->eventmask = 0; + serial->generation = 0; serial->fd = (struct fd *)grab_object( fd ); set_fd_user( fd, &serial_fd_ops, &serial->obj ); return &serial->obj; @@ -210,6 +212,7 @@ DECL_HANDLER(get_serial_info) /* event mask */ reply->eventmask = serial->eventmask; + reply->cookie = serial->generation; release_object( serial ); } @@ -235,10 +238,8 @@ DECL_HANDLER(set_serial_info) if (req->flags & SERIALINFO_SET_MASK) { serial->eventmask = req->eventmask; - if (!serial->eventmask) - { - fd_async_wake_up( serial->fd, ASYNC_TYPE_WAIT, STATUS_SUCCESS ); - } + serial->generation++; + fd_async_wake_up( serial->fd, ASYNC_TYPE_WAIT, STATUS_SUCCESS ); } release_object( serial ); diff --git a/server/trace.c b/server/trace.c index 5b51e05..3f17b61 100644 --- a/server/trace.c +++ b/server/trace.c @@ -2687,6 +2687,7 @@ static void dump_get_serial_info_reply( const struct get_serial_info_reply *req fprintf( stderr, ", writeconst=%08x", req->writeconst ); fprintf( stderr, ", writemult=%08x", req->writemult ); fprintf( stderr, ", eventmask=%08x", req->eventmask ); + fprintf( stderr, ", cookie=%08x", req->cookie ); } static void dump_set_serial_info_request( const struct set_serial_info_request *req )

1 0

Bruno Jesus : ws2_32: Implement get socket option SO_PROTOCOL_INFO.
by Alexandre Julliard 10 Sep '13

10 Sep '13

Module: wine Branch: master Commit: dea4f7bc02c388f6d17b28217995e2dc7611beb1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=dea4f7bc02c388f6d17b28217… Author: Bruno Jesus <00cpxxx(a)gmail.com> Date: Tue Sep 10 00:56:47 2013 -0300 ws2_32: Implement get socket option SO_PROTOCOL_INFO. --- dlls/ws2_32/socket.c | 53 ++++++++++++++++++++++++++++++++++++++++++++++ dlls/ws2_32/tests/sock.c | 45 ++++++++++++++++++++++++++------------ 2 files changed, 84 insertions(+), 14 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 833c713..5f5f161 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -1747,6 +1747,40 @@ static INT WS_EnumProtocols( BOOL unicode, const INT *protocols, LPWSAPROTOCOL_I return items; } +static BOOL ws_protocol_info(SOCKET s, int unicode, WSAPROTOCOL_INFOW *buffer, int *size) +{ + NTSTATUS status; + + *size = unicode ? sizeof(WSAPROTOCOL_INFOW) : sizeof(WSAPROTOCOL_INFOA); + memset(buffer, 0, *size); + + SERVER_START_REQ( get_socket_info ) + { + req->handle = wine_server_obj_handle( SOCKET2HANDLE(s) ); + status = wine_server_call( req ); + if (!status) + { + buffer->iAddressFamily = convert_af_u2w(reply->family); + buffer->iSocketType = convert_socktype_u2w(reply->type); + buffer->iProtocol = convert_proto_u2w(reply->protocol); + } + } + SERVER_END_REQ; + + if (status) + { + set_error(status); + return FALSE; + } + + if (unicode) + WS_EnterSingleProtocolW( buffer->iProtocol, buffer); + else + WS_EnterSingleProtocolA( buffer->iProtocol, (WSAPROTOCOL_INFOA *)buffer); + + return TRUE; +} + /************************************************************************** * Functions for handling overlapped I/O **************************************************************************/ @@ -3024,7 +3058,26 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level, *optlen = sizeof(int); TRACE("getting global SO_OPENTYPE = 0x%x\n", *((int*)optval) ); return 0; + case WS_SO_PROTOCOL_INFOA: + case WS_SO_PROTOCOL_INFOW: + { + int size; + WSAPROTOCOL_INFOW infow; + ret = ws_protocol_info(s, optname == WS_SO_PROTOCOL_INFOW, &infow, &size); + if (ret) + { + if (!optlen || !optval || *optlen < size) + { + if(optlen) *optlen = size; + ret = 0; + SetLastError(WSAEFAULT); + } + else + memcpy(optval, &infow, size); + } + return ret ? 0 : SOCKET_ERROR; + } #ifdef SO_RCVTIMEO case WS_SO_RCVTIMEO: #endif diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 78521ae..e072033 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -1235,29 +1235,40 @@ todo_wine closesocket(s); /* test SO_PROTOCOL_INFOA invalid parameters */ + ok(getsockopt(INVALID_SOCKET, SOL_SOCKET, SO_PROTOCOL_INFOA, NULL, NULL), + "getsockopt should have failed\n"); + err = WSAGetLastError(); + ok(err == WSAENOTSOCK, "expected 10038, got %d instead\n", err); + size = sizeof(WSAPROTOCOL_INFOA); + ok(getsockopt(INVALID_SOCKET, SOL_SOCKET, SO_PROTOCOL_INFOA, (char *) &infoA, &size), + "getsockopt should have failed\n"); + ok(size == sizeof(WSAPROTOCOL_INFOA), "got size %d\n", size); + err = WSAGetLastError(); + ok(err == WSAENOTSOCK, "expected 10038, got %d instead\n", err); s = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); ok(getsockopt(s, SOL_SOCKET, SO_PROTOCOL_INFOA, NULL, NULL), "getsockopt should have failed\n"); err = WSAGetLastError(); -todo_wine ok(err == WSAEFAULT, "expected 10014, got %d instead\n", err); ok(getsockopt(s, SOL_SOCKET, SO_PROTOCOL_INFOA, (char *) &infoA, NULL), "getsockopt should have failed\n"); err = WSAGetLastError(); -todo_wine ok(err == WSAEFAULT, "expected 10014, got %d instead\n", err); ok(getsockopt(s, SOL_SOCKET, SO_PROTOCOL_INFOA, NULL, &size), "getsockopt should have failed\n"); err = WSAGetLastError(); -todo_wine ok(err == WSAEFAULT, "expected 10014, got %d instead\n", err); - size = sizeof(WSAPROTOCOL_INFOA) / 2; ok(getsockopt(s, SOL_SOCKET, SO_PROTOCOL_INFOA, (char *) &infoA, &size), "getsockopt should have failed\n"); err = WSAGetLastError(); -todo_wine ok(err == WSAEFAULT, "expected 10014, got %d instead\n", err); + ok(size == sizeof(WSAPROTOCOL_INFOA), "got size %d\n", size); + size = sizeof(WSAPROTOCOL_INFOA) * 2; + err = getsockopt(s, SOL_SOCKET, SO_PROTOCOL_INFOA, (char *) &infoA, &size); + ok(!err,"getsockopt failed with %d\n", WSAGetLastError()); + ok(size == sizeof(WSAPROTOCOL_INFOA) * 2, "got size %d\n", size); + closesocket(s); /* test SO_PROTOCOL_INFO structure returned for different protocols */ @@ -1273,40 +1284,46 @@ todo_wine infoA.szProtocol[0] = 0; size = sizeof(WSAPROTOCOL_INFOA); err = getsockopt(s, SOL_SOCKET, SO_PROTOCOL_INFOA, (char *) &infoA, &size); -todo_wine ok(!err,"getsockopt failed with %d\n", WSAGetLastError()); + ok(size == sizeof(WSAPROTOCOL_INFOA), "got size %d\n", size); infoW.szProtocol[0] = 0; size = sizeof(WSAPROTOCOL_INFOW); err = getsockopt(s, SOL_SOCKET, SO_PROTOCOL_INFOW, (char *) &infoW, &size); -todo_wine ok(!err,"getsockopt failed with %d\n", WSAGetLastError()); + ok(size == sizeof(WSAPROTOCOL_INFOW), "got size %d\n", size); trace("provider name '%s', family %d, type %d, proto %d\n", infoA.szProtocol, prottest[i].family, prottest[i].type, prottest[i].proto); - todo_wine { ok(infoA.szProtocol[0] || broken(!infoA.szProtocol[0]) /* NT4 */, "WSAPROTOCOL_INFOA was not filled\n"); ok(infoW.szProtocol[0] || broken(!infoA.szProtocol[0]) /* NT4 */, "WSAPROTOCOL_INFOW was not filled\n"); - } WideCharToMultiByte(CP_ACP, 0, infoW.szProtocol, -1, providername, sizeof(providername), NULL, NULL); ok(!strcmp(infoA.szProtocol,providername), "different provider names '%s' != '%s'\n", infoA.szProtocol, providername); - todo_wine { ok(!memcmp(&infoA, &infoW, FIELD_OFFSET(WSAPROTOCOL_INFOA, szProtocol)), "SO_PROTOCOL_INFO[A/W] comparison failed\n"); - ok(infoA.iAddressFamily == prottest[i].family, "socket family invalid, expected %d received %d\n", - prottest[i].family, infoA.iAddressFamily); - ok(infoA.iSocketType == prottest[i].type, "socket type invalid, expected %d received %d\n", + + /* Remove IF when WSAEnumProtocols support IPV6 data */ + if (prottest[i].family == AF_INET6) + { + todo_wine + ok(infoA.iAddressFamily == prottest[i].family, "socket family invalid, expected %d received %d\n", + prottest[i].family, infoA.iAddressFamily); + } + else + { + ok(infoA.iAddressFamily == prottest[i].family, "socket family invalid, expected %d received %d\n", + prottest[i].family, infoA.iAddressFamily); + } ok(infoA.iSocketType == prottest[i].type, "socket type invalid, expected %d received %d\n", prottest[i].type, infoA.iSocketType); ok(infoA.iProtocol == prottest[i].proto, "socket protocol invalid, expected %d received %d\n", prottest[i].proto, infoA.iProtocol); - } closesocket(s); }

1 0

Jactry Zeng : riched20: Add a length return parameter to ME_ToUnicode.
by Alexandre Julliard 10 Sep '13

10 Sep '13

Module: wine Branch: master Commit: 1cbdb2aff7cb690be5a99ca36e994f84504e4b5b URL: http://source.winehq.org/git/wine.git/?a=commit;h=1cbdb2aff7cb690be5a99ca36… Author: Jactry Zeng <jactry92(a)gmail.com> Date: Fri Sep 6 10:46:10 2013 +0800 riched20: Add a length return parameter to ME_ToUnicode. --- dlls/riched20/editor.c | 15 +++++++-------- dlls/riched20/editor.h | 2 +- dlls/riched20/string.c | 13 ++++++++++--- 3 files changed, 18 insertions(+), 12 deletions(-) diff --git a/dlls/riched20/editor.c b/dlls/riched20/editor.c index f54458e..9af8a23 100644 --- a/dlls/riched20/editor.c +++ b/dlls/riched20/editor.c @@ -3276,8 +3276,7 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, { LPWSTR wszText; SETTEXTEX *pStruct = (SETTEXTEX *)wParam; - size_t len = 0; - int from, to; + int from, to, len; ME_Style *style; BOOL bRtf, bUnicode, bSelection; int oldModify = editor->nModifyStep; @@ -3315,8 +3314,7 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, } } else { /* FIXME: make use of pStruct->codepage in the to unicode translation */ - wszText = lParam ? ME_ToUnicode(bUnicode, (void *)lParam) : NULL; - len = wszText ? lstrlenW(wszText) : 0; + wszText = ME_ToUnicode(bUnicode, (void *)lParam, &len); ME_InsertTextFromCursor(editor, 0, wszText, len, style); ME_EndToUnicode(bUnicode, wszText); } @@ -3505,8 +3503,8 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, { int from, to, nStartCursor; ME_Style *style; - LPWSTR wszText = lParam ? ME_ToUnicode(unicode, (void *)lParam) : NULL; - size_t len = wszText ? lstrlenW(wszText) : 0; + int len = 0; + LPWSTR wszText = ME_ToUnicode(unicode, (void *)lParam, &len); TRACE("EM_REPLACESEL - %s\n", debugstr_w(wszText)); nStartCursor = ME_GetSelectionOfs(editor, &from, &to); @@ -3576,9 +3574,10 @@ LRESULT ME_HandleMessage(ME_TextEditor *editor, UINT msg, WPARAM wParam, } else { - LPWSTR wszText = ME_ToUnicode(unicode, (void *)lParam); + int textLen; + LPWSTR wszText = ME_ToUnicode(unicode, (void *)lParam, &textLen); TRACE("WM_SETTEXT - %s\n", debugstr_w(wszText)); /* debugstr_w() */ - if (lstrlenW(wszText) > 0) + if (textLen > 0) { int len = -1; diff --git a/dlls/riched20/editor.h b/dlls/riched20/editor.h index 8c78447..5893051 100644 --- a/dlls/riched20/editor.h +++ b/dlls/riched20/editor.h @@ -109,7 +109,7 @@ void ME_StrDeleteV(ME_String *s, int nVChar, int nChars) DECLSPEC_HIDDEN; BOOL ME_InsertString(ME_String *s, int ofs, const WCHAR *insert, int len) DECLSPEC_HIDDEN; /* smart helpers for A<->W conversions, they reserve/free memory and call MultiByte<->WideChar functions */ -LPWSTR ME_ToUnicode(BOOL unicode, LPVOID psz) DECLSPEC_HIDDEN; +LPWSTR ME_ToUnicode(BOOL unicode, LPVOID psz, INT *len) DECLSPEC_HIDDEN; void ME_EndToUnicode(BOOL unicode, LPVOID psz) DECLSPEC_HIDDEN; static inline int ME_IsWSpace(WCHAR ch) diff --git a/dlls/riched20/string.c b/dlls/riched20/string.c index 6d7d222..f4cd320 100644 --- a/dlls/riched20/string.c +++ b/dlls/riched20/string.c @@ -172,17 +172,24 @@ ME_CallWordBreakProc(ME_TextEditor *editor, WCHAR *str, INT len, INT start, INT } } -LPWSTR ME_ToUnicode(BOOL unicode, LPVOID psz) +LPWSTR ME_ToUnicode(BOOL unicode, LPVOID psz, INT *len) { - assert(psz != NULL); + *len = 0; + if (!psz) return NULL; if (unicode) + { + *len = lstrlenW(psz); return psz; + } else { WCHAR *tmp; int nChars = MultiByteToWideChar(CP_ACP, 0, psz, -1, NULL, 0); + + if(!nChars) return NULL; + if((tmp = ALLOC_N_OBJ(WCHAR, nChars)) != NULL) - MultiByteToWideChar(CP_ACP, 0, psz, -1, tmp, nChars); + *len = MultiByteToWideChar(CP_ACP, 0, psz, -1, tmp, nChars) - 1; return tmp; } }

1 0

Stefan Dösinger : d3d8/tests: Test the behavior of failing surface creation calls.
by Alexandre Julliard 10 Sep '13

10 Sep '13

Module: wine Branch: master Commit: 99da74fea44076ac96f20a6ebe77f0c066f9c633 URL: http://source.winehq.org/git/wine.git/?a=commit;h=99da74fea44076ac96f20a6eb… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Sep 10 12:14:00 2013 +0200 d3d8/tests: Test the behavior of failing surface creation calls. --- dlls/d3d8/tests/device.c | 51 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 51 insertions(+), 0 deletions(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index eb7f1f4..2b791f7 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -5320,6 +5320,56 @@ out: IDirect3D8_Release(d3d8); DestroyWindow(window); } + +static void test_create_rt_ds_fail(void) +{ + IDirect3DDevice8 *device; + HWND window; + HRESULT hr; + ULONG refcount; + IDirect3D8 *d3d8; + IDirect3DSurface8 *surface; + + if (!(d3d8 = pDirect3DCreate8(D3D_SDK_VERSION))) + { + skip("Failed to create IDirect3D8 object, skipping tests.\n"); + return; + } + + window = CreateWindowA("static", "d3d8_test", WS_OVERLAPPEDWINDOW, + 0, 0, 640, 480, 0, 0, 0, 0); + if (!(device = create_device(d3d8, window, window, TRUE))) + { + skip("Failed to create a D3D device, skipping tests.\n"); + IDirect3D8_Release(d3d8); + DestroyWindow(window); + return; + } + + /* Output pointer == NULL segfaults on Windows. */ + + surface = (IDirect3DSurface8 *)0xdeadbeef; + hr = IDirect3DDevice8_CreateRenderTarget(device, 4, 4, D3DFMT_D16, + D3DMULTISAMPLE_NONE, FALSE, &surface); + ok(hr == D3DERR_INVALIDCALL, "Creating a D16 render target returned hr %#x.\n", hr); + ok(surface == NULL, "Got pointer %p, expected NULL.\n", surface); + if (SUCCEEDED(hr)) + IDirect3DSurface8_Release(surface); + + surface = (IDirect3DSurface8 *)0xdeadbeef; + hr = IDirect3DDevice8_CreateDepthStencilSurface(device, 4, 4, D3DFMT_A8R8G8B8, + D3DMULTISAMPLE_NONE, &surface); + ok(hr == D3DERR_INVALIDCALL, "Creating a A8R8G8B8 depth stencil returned hr %#x.\n", hr); + ok(surface == NULL, "Got pointer %p, expected NULL.\n", surface); + if (SUCCEEDED(hr)) + IDirect3DSurface8_Release(surface); + + refcount = IDirect3DDevice8_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + IDirect3D8_Release(d3d8); + DestroyWindow(window); +} + START_TEST(device) { HMODULE d3d8_handle = LoadLibraryA( "d3d8.dll" ); @@ -5399,6 +5449,7 @@ START_TEST(device) test_npot_textures(); test_volume_locking(); test_update_volumetexture(); + test_create_rt_ds_fail(); } UnregisterClassA("d3d8_test_wc", GetModuleHandleA(NULL)); }

1 0

Stefan Dösinger : d3d9/tests: Test the behavior of failing surface creation calls.
by Alexandre Julliard 10 Sep '13

10 Sep '13

Module: wine Branch: master Commit: b59418d75d5b24fb87b662d2e40f5a3eee09e69d URL: http://source.winehq.org/git/wine.git/?a=commit;h=b59418d75d5b24fb87b662d2e… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Sep 10 12:14:01 2013 +0200 d3d9/tests: Test the behavior of failing surface creation calls. --- dlls/d3d9/tests/device.c | 50 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 50 insertions(+), 0 deletions(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 2514153..235d482 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -6890,6 +6890,55 @@ out: DestroyWindow(window); } +static void test_create_rt_ds_fail(void) +{ + IDirect3DDevice9 *device; + HWND window; + HRESULT hr; + ULONG refcount; + IDirect3D9 *d3d9; + IDirect3DSurface9 *surface; + + if (!(d3d9 = pDirect3DCreate9(D3D_SDK_VERSION))) + { + skip("Failed to create IDirect3D9 object, skipping tests.\n"); + return; + } + + window = CreateWindowA("static", "d3d9_test", WS_OVERLAPPEDWINDOW, + 0, 0, 640, 480, 0, 0, 0, 0); + if (!(device = create_device(d3d9, window, window, TRUE))) + { + skip("Failed to create a D3D device, skipping tests.\n"); + IDirect3D9_Release(d3d9); + DestroyWindow(window); + return; + } + + /* Output pointer == NULL segfaults on Windows. */ + + surface = (IDirect3DSurface9 *)0xdeadbeef; + hr = IDirect3DDevice9_CreateRenderTarget(device, 4, 4, D3DFMT_D16, + D3DMULTISAMPLE_NONE, 0, FALSE, &surface, NULL); + ok(hr == D3DERR_INVALIDCALL, "Creating a D16 render target returned hr %#x.\n", hr); + ok(surface == NULL, "Got pointer %p, expected NULL.\n", surface); + if (SUCCEEDED(hr)) + IDirect3DSurface9_Release(surface); + + surface = (IDirect3DSurface9 *)0xdeadbeef; + hr = IDirect3DDevice9_CreateDepthStencilSurface(device, 4, 4, D3DFMT_A8R8G8B8, + D3DMULTISAMPLE_NONE, 0, TRUE, &surface, NULL); + ok(hr == D3DERR_INVALIDCALL, "Creating a A8R8G8B8 depth stencil returned hr %#x.\n", hr); + ok(surface == NULL, "Got pointer %p, expected NULL.\n", surface); + if (SUCCEEDED(hr)) + IDirect3DSurface9_Release(surface); + + refcount = IDirect3DDevice9_Release(device); + ok(!refcount, "Device has %u references left.\n", refcount); + IDirect3D9_Release(d3d9); + DestroyWindow(window); +} + START_TEST(device) { HMODULE d3d9_handle = LoadLibraryA( "d3d9.dll" ); @@ -6982,6 +7031,7 @@ START_TEST(device) test_vidmem_accounting(); test_volume_locking(); test_update_volumetexture(); + test_create_rt_ds_fail(); } out:

1 0

Stefan Dösinger : d3d8/tests: Mark YUY2 and UYVY broken.
by Alexandre Julliard 10 Sep '13

10 Sep '13

Module: wine Branch: master Commit: 5b48335ce24b0518600874b7901063ef05bb0164 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5b48335ce24b0518600874b79… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Tue Sep 10 12:14:02 2013 +0200 d3d8/tests: Mark YUY2 and UYVY broken. --- dlls/d3d8/tests/device.c | 7 +++++-- 1 files changed, 5 insertions(+), 2 deletions(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index 2b791f7..83cdaf9 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -4362,8 +4362,11 @@ static void test_surface_blocks(void) * which doesn't match the format spec. On newer Nvidia cards * it has the correct 4x4 block size */ {MAKEFOURCC('A','T','I','2'), "ATI2N", 4, 4, TRUE, FALSE, FALSE}, - {D3DFMT_YUY2, "D3DFMT_YUY2", 2, 1, FALSE, FALSE, TRUE }, - {D3DFMT_UYVY, "D3DFMT_UYVY", 2, 1, FALSE, FALSE, TRUE }, + /* Windows drivers generally enforce block-aligned locks for + * YUY2 and UYVY. The notable exception is the AMD r500 driver + * in d3d8. The same driver checks the sizes in d3d9. */ + {D3DFMT_YUY2, "D3DFMT_YUY2", 2, 1, TRUE, FALSE, TRUE }, + {D3DFMT_UYVY, "D3DFMT_UYVY", 2, 1, TRUE, FALSE, TRUE }, }; static const struct {

1 0