September 2013 - Wine-Commits

Bruno Jesus : ws2_32: Implement get socket option SO_PROTOCOL_INFO.
by Alexandre Julliard Sept. 10, 2013

Sept. 10, 2013

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

Dmitry Timoshkov : server: Add a serial event mask change counter.
by Alexandre Julliard Sept. 10, 2013

Sept. 10, 2013

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

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

Sept. 10, 2013

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

André Hentschel : kernel32: Add partial CreateFile2 implementation.
by Alexandre Julliard Sept. 10, 2013

Sept. 10, 2013

Module: wine Branch: master Commit: fa6b0580702b1cdcf97f64ac34b53095604c1230 URL: http://source.winehq.org/git/wine.git/?a=commit;h=fa6b0580702b1cdcf97f64ac3… Author: André Hentschel <nerv(a)dawncrow.de> Date: Tue Sep 10 00:24:55 2013 +0200 kernel32: Add partial CreateFile2 implementation. --- dlls/kernel32/file.c | 15 +++++++++++++++ dlls/kernel32/kernel32.spec | 1 + include/Makefile.in | 1 + include/fileapi.h | 41 +++++++++++++++++++++++++++++++++++++++++ 4 files changed, 58 insertions(+), 0 deletions(-) diff --git a/dlls/kernel32/file.c b/dlls/kernel32/file.c index 89e0fad..506b651 100644 --- a/dlls/kernel32/file.c +++ b/dlls/kernel32/file.c @@ -42,6 +42,7 @@ #include "wincon.h" #include "ddk/ntddk.h" #include "kernel_private.h" +#include "fileapi.h" #include "wine/exception.h" #include "wine/unicode.h" @@ -1527,6 +1528,20 @@ HANDLE WINAPI CreateFileA( LPCSTR filename, DWORD access, DWORD sharing, return CreateFileW( nameW, access, sharing, sa, creation, attributes, template ); } +/************************************************************************* + * CreateFile2 (KERNEL32.@) + */ +HANDLE WINAPI CreateFile2( LPCWSTR filename, DWORD access, DWORD sharing, DWORD creation, + CREATEFILE2_EXTENDED_PARAMETERS *exparams ) +{ + LPSECURITY_ATTRIBUTES sa = exparams ? exparams->lpSecurityAttributes : NULL; + DWORD attributes = exparams ? exparams->dwFileAttributes : 0; + HANDLE template = exparams ? exparams->hTemplateFile : NULL; + + FIXME("(%s %x %x %x %p), partial stub\n", debugstr_w(filename), access, sharing, creation, exparams); + + return CreateFileW( filename, access, sharing, sa, creation, attributes, template ); +} /*********************************************************************** * DeleteFileW (KERNEL32.@) diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec index 57cc38b..08b225f 100644 --- a/dlls/kernel32/kernel32.spec +++ b/dlls/kernel32/kernel32.spec @@ -229,6 +229,7 @@ @ stdcall CreateEventW(ptr long long wstr) @ stdcall CreateFiber(long ptr ptr) @ stdcall CreateFiberEx(long long long ptr ptr) +@ stdcall CreateFile2(wstr long long long ptr) @ stdcall CreateFileA(str long long ptr long long long) @ stdcall CreateFileMappingA(long ptr long long long str) @ stdcall CreateFileMappingW(long ptr long long long wstr) diff --git a/include/Makefile.in b/include/Makefile.in index 3da2977..d40284e 100644 --- a/include/Makefile.in +++ b/include/Makefile.in @@ -302,6 +302,7 @@ SRCDIR_INCLUDES = \ exdispid.h \ fci.h \ fdi.h \ + fileapi.h \ fltdefs.h \ gdiplus.h \ gdipluscolor.h \ diff --git a/include/fileapi.h b/include/fileapi.h new file mode 100644 index 0000000..02bbbd4 --- /dev/null +++ b/include/fileapi.h @@ -0,0 +1,41 @@ +/* + * Copyright 2013 André Hentschel + * + * 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 + */ + +#ifndef __WINE_FILEAPI_H +#define __WINE_FILEAPI_H + +#ifdef __cplusplus +extern "C" { +#endif + +typedef struct _CREATEFILE2_EXTENDED_PARAMETERS { + DWORD dwSize; + DWORD dwFileAttributes; + DWORD dwFileFlags; + DWORD dwSecurityQosFlags; + LPSECURITY_ATTRIBUTES lpSecurityAttributes; + HANDLE hTemplateFile; +} CREATEFILE2_EXTENDED_PARAMETERS, *PCREATEFILE2_EXTENDED_PARAMETERS, *LPCREATEFILE2_EXTENDED_PARAMETERS; + +WINBASEAPI HANDLE WINAPI CreateFile2(LPCWSTR,DWORD,DWORD,DWORD,LPCREATEFILE2_EXTENDED_PARAMETERS); + +#ifdef __cplusplus +} +#endif + +#endif /* __WINE_FILEAPI_H */

1 0

Stefan Dösinger : ddraw/tests: Don' t test transformed vertices with normals.
by Alexandre Julliard Sept. 9, 2013

Sept. 9, 2013

Module: wine Branch: master Commit: 20ce6bd102baa407ca5c6960e4416ab429ae7c1c URL: http://source.winehq.org/git/wine.git/?a=commit;h=20ce6bd102baa407ca5c6960e… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Sep 9 15:15:38 2013 +0200 ddraw/tests: Don't test transformed vertices with normals. They crash the GPU driver of my r200 WinXP laptop, causing anything from a BSOD to a frozen or black screen and sometimes incorrectly set resolutions. --- dlls/ddraw/tests/ddraw4.c | 25 ------------------------- dlls/ddraw/tests/ddraw7.c | 26 -------------------------- 2 files changed, 0 insertions(+), 51 deletions(-) diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index 485633f..21a2d40 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -3516,21 +3516,6 @@ static void test_lighting_interface_versions(void) {{ 640.0f}, { 0.0f}, {0.0f}, {1.0f}, {0xff0000ff}, {0xff808080}}, }; -#define FVF_TLVERTEX2 (D3DFVF_XYZRHW | D3DFVF_NORMAL | D3DFVF_DIFFUSE | D3DFVF_SPECULAR) - static struct - { - struct vec4 position; - struct vec3 normal; - DWORD diffuse, specular; - } - tlquad2[] = - { - {{ 0.0f, 480.0f, 0.0f, 1.0f}, {1.0f, 0.0f, 0.0f}, 0xff0000ff, 0xff808080}, - {{ 0.0f, 0.0f, 0.0f, 1.0f}, {1.0f, 0.0f, 0.0f}, 0xff0000ff, 0xff808080}, - {{ 640.0f, 480.0f, 0.0f, 1.0f}, {1.0f, 0.0f, 0.0f}, 0xff0000ff, 0xff808080}, - {{ 640.0f, 0.0f, 0.0f, 1.0f}, {1.0f, 0.0f, 0.0f}, 0xff0000ff, 0xff808080}, - }; - static const struct { DWORD vertextype; @@ -3600,16 +3585,6 @@ static void test_lighting_interface_versions(void) { D3DFVF_TLVERTEX, tlquad, TRUE, TRUE, 0, 0x008080ff}, { D3DFVF_TLVERTEX, tlquad, FALSE, TRUE, D3DDP_DONOTLIGHT, 0x008080ff}, { D3DFVF_TLVERTEX, tlquad, TRUE, TRUE, D3DDP_DONOTLIGHT, 0x008080ff}, - - /* 40 */ - { FVF_TLVERTEX2, tlquad2, FALSE, FALSE, 0, 0x000000ff}, - { FVF_TLVERTEX2, tlquad2, TRUE, FALSE, 0, 0x000000ff}, - { FVF_TLVERTEX2, tlquad2, FALSE, FALSE, D3DDP_DONOTLIGHT, 0x000000ff}, - { FVF_TLVERTEX2, tlquad2, TRUE, FALSE, D3DDP_DONOTLIGHT, 0x000000ff}, - { FVF_TLVERTEX2, tlquad2, FALSE, TRUE, 0, 0x008080ff}, - { FVF_TLVERTEX2, tlquad2, TRUE, TRUE, 0, 0x008080ff}, - { FVF_TLVERTEX2, tlquad2, FALSE, TRUE, D3DDP_DONOTLIGHT, 0x008080ff}, - { FVF_TLVERTEX2, tlquad2, TRUE, TRUE, D3DDP_DONOTLIGHT, 0x008080ff}, }; window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW, diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 7c97432..ebfb16f 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -3339,22 +3339,6 @@ static void test_lighting_interface_versions(void) {{ 640.0f}, { 0.0f}, {0.0f}, {1.0f}, {0xff0000ff}, {0xff808080}}, }; -#define FVF_TLVERTEX2 (D3DFVF_XYZRHW | D3DFVF_NORMAL | D3DFVF_DIFFUSE | D3DFVF_SPECULAR) - static struct - { - struct vec4 position; - struct vec3 normal; - DWORD diffuse, specular; - } - tlquad2[] = - { - {{ 0.0f, 480.0f, 0.0f, 1.0f}, {1.0f, 0.0f, 0.0f}, 0xff0000ff, 0xff808080}, - {{ 0.0f, 0.0f, 0.0f, 1.0f}, {1.0f, 0.0f, 0.0f}, 0xff0000ff, 0xff808080}, - {{ 640.0f, 480.0f, 0.0f, 1.0f}, {1.0f, 0.0f, 0.0f}, 0xff0000ff, 0xff808080}, - {{ 640.0f, 0.0f, 0.0f, 1.0f}, {1.0f, 0.0f, 0.0f}, 0xff0000ff, 0xff808080}, - }; - - static const struct { DWORD vertextype; @@ -3422,16 +3406,6 @@ static void test_lighting_interface_versions(void) { D3DFVF_TLVERTEX, tlquad, TRUE, TRUE, 0, 0x008080ff}, { D3DFVF_TLVERTEX, tlquad, FALSE, TRUE, D3DDP_DONOTLIGHT, 0x008080ff}, { D3DFVF_TLVERTEX, tlquad, TRUE, TRUE, D3DDP_DONOTLIGHT, 0x008080ff}, - - /* 40 */ - { FVF_TLVERTEX2, tlquad2, FALSE, FALSE, 0, 0x000000ff}, - { FVF_TLVERTEX2, tlquad2, TRUE, FALSE, 0, 0x000000ff}, - { FVF_TLVERTEX2, tlquad2, FALSE, FALSE, D3DDP_DONOTLIGHT, 0x000000ff}, - { FVF_TLVERTEX2, tlquad2, TRUE, FALSE, D3DDP_DONOTLIGHT, 0x000000ff}, - { FVF_TLVERTEX2, tlquad2, FALSE, TRUE, 0, 0x008080ff}, - { FVF_TLVERTEX2, tlquad2, TRUE, TRUE, 0, 0x008080ff}, - { FVF_TLVERTEX2, tlquad2, FALSE, TRUE, D3DDP_DONOTLIGHT, 0x008080ff}, - { FVF_TLVERTEX2, tlquad2, TRUE, TRUE, D3DDP_DONOTLIGHT, 0x008080ff}, }; window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW,

1 0

Stefan Dösinger : wined3d: Only invalidate STATE_INDEXBUFFER for the current context in buffer_create_buffer_object ().
by Alexandre Julliard Sept. 9, 2013

Sept. 9, 2013

Module: wine Branch: master Commit: 1cf192172e4ea2533da99cde403686b584760234 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1cf192172e4ea2533da99cde4… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Sep 9 15:15:35 2013 +0200 wined3d: Only invalidate STATE_INDEXBUFFER for the current context in buffer_create_buffer_object(). --- dlls/wined3d/buffer.c | 11 ++++++----- dlls/wined3d/context.c | 2 +- dlls/wined3d/device.c | 16 +++++++++------- dlls/wined3d/wined3d_private.h | 4 ++-- 4 files changed, 18 insertions(+), 15 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index 00e4dae..6314ded 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -118,10 +118,11 @@ static void delete_gl_buffer(struct wined3d_buffer *This, const struct wined3d_g } /* Context activation is done by the caller. */ -static void buffer_create_buffer_object(struct wined3d_buffer *This, const struct wined3d_gl_info *gl_info) +static void buffer_create_buffer_object(struct wined3d_buffer *This, struct wined3d_context *context) { GLenum gl_usage = GL_STATIC_DRAW_ARB; GLenum error; + const struct wined3d_gl_info *gl_info = context->gl_info; TRACE("Creating an OpenGL vertex buffer object for wined3d_buffer %p with usage %s.\n", This, debug_d3dusage(This->resource.usage)); @@ -148,7 +149,7 @@ static void buffer_create_buffer_object(struct wined3d_buffer *This, const struc } if (This->buffer_type_hint == GL_ELEMENT_ARRAY_BUFFER_ARB) - device_invalidate_state(This->resource.device, STATE_INDEXBUFFER); + context_invalidate_state(context, STATE_INDEXBUFFER); GL_EXTCALL(glBindBufferARB(This->buffer_type_hint, This->buffer_object)); error = gl_info->gl_ops.gl.p_glGetError(); if (error != GL_NO_ERROR) @@ -460,7 +461,7 @@ static inline void fixup_transformed_pos(float *p) } /* Context activation is done by the caller. */ -void buffer_get_memory(struct wined3d_buffer *buffer, const struct wined3d_gl_info *gl_info, +void buffer_get_memory(struct wined3d_buffer *buffer, struct wined3d_context *context, struct wined3d_bo_address *data) { data->buffer_object = buffer->buffer_object; @@ -468,7 +469,7 @@ void buffer_get_memory(struct wined3d_buffer *buffer, const struct wined3d_gl_in { if ((buffer->flags & WINED3D_BUFFER_CREATEBO) && !buffer->resource.map_count) { - buffer_create_buffer_object(buffer, gl_info); + buffer_create_buffer_object(buffer, context); buffer->flags &= ~WINED3D_BUFFER_CREATEBO; if (buffer->buffer_object) { @@ -754,7 +755,7 @@ void CDECL wined3d_buffer_preload(struct wined3d_buffer *buffer) if (buffer->flags & WINED3D_BUFFER_CREATEBO) { context = context_acquire(device, NULL); - buffer_create_buffer_object(buffer, context->gl_info); + buffer_create_buffer_object(buffer, context); context_release(context); buffer->flags &= ~WINED3D_BUFFER_CREATEBO; } diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index bb3b06b..f05fdcc 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -2368,7 +2368,7 @@ BOOL context_apply_draw_state(struct wined3d_context *context, struct wined3d_de device_update_tex_unit_map(device); device_preload_textures(device); if (isStateDirty(context, STATE_VDECL) || isStateDirty(context, STATE_STREAMSRC)) - device_update_stream_info(device, context->gl_info); + device_update_stream_info(device, context); if (state->index_buffer) { if (device->stream_info.all_vbo) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 65209e3..1ef2763 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -164,7 +164,8 @@ static BOOL fixed_get_input(BYTE usage, BYTE usage_idx, unsigned int *regnum) } /* Context activation is done by the caller. */ -static void device_stream_info_from_declaration(struct wined3d_device *device, struct wined3d_stream_info *stream_info) +static void device_stream_info_from_declaration(struct wined3d_device *device, struct wined3d_stream_info *stream_info, + struct wined3d_context *context) { const struct wined3d_state *state = &device->state; /* We need to deal with frequency data! */ @@ -200,7 +201,7 @@ static void device_stream_info_from_declaration(struct wined3d_device *device, s stride = stream->stride; TRACE("Stream %u, buffer %p.\n", element->input_slot, buffer); - buffer_get_memory(buffer, &device->adapter->gl_info, &data); + buffer_get_memory(buffer, context, &data); /* We can't use VBOs if the base vertex index is negative. OpenGL * doesn't accept negative offsets (or rather offsets bigger than the @@ -213,7 +214,7 @@ static void device_stream_info_from_declaration(struct wined3d_device *device, s { WARN_(d3d_perf)("load_base_vertex_index is < 0 (%d), not using VBOs.\n", state->load_base_vertex_index); data.buffer_object = 0; - data.addr = buffer_get_sysmem(buffer, &device->adapter->gl_info); + data.addr = buffer_get_sysmem(buffer, context->gl_info); if ((UINT_PTR)data.addr < -state->load_base_vertex_index * stride) FIXME("System memory vertex data load offset is negative!\n"); } @@ -266,7 +267,7 @@ static void device_stream_info_from_declaration(struct wined3d_device *device, s stream_info->elements[idx].stride = stride; stream_info->elements[idx].stream_idx = element->input_slot; - if (!device->adapter->gl_info.supported[ARB_VERTEX_ARRAY_BGRA] + if (!context->gl_info->supported[ARB_VERTEX_ARRAY_BGRA] && element->format->id == WINED3DFMT_B8G8R8A8_UNORM) { stream_info->swizzle_map |= 1 << idx; @@ -305,14 +306,15 @@ static void device_stream_info_from_declaration(struct wined3d_device *device, s } /* Context activation is done by the caller. */ -void device_update_stream_info(struct wined3d_device *device, const struct wined3d_gl_info *gl_info) +void device_update_stream_info(struct wined3d_device *device, struct wined3d_context *context) { + const struct wined3d_gl_info *gl_info = context->gl_info; struct wined3d_stream_info *stream_info = &device->stream_info; const struct wined3d_state *state = &device->state; DWORD prev_all_vbo = stream_info->all_vbo; TRACE("============================= Vertex Declaration =============================\n"); - device_stream_info_from_declaration(device, stream_info); + device_stream_info_from_declaration(device, stream_info, context); if (state->vertex_shader && !stream_info->position_transformed) { @@ -3535,7 +3537,7 @@ HRESULT CDECL wined3d_device_process_vertices(struct wined3d_device *device, vs = state->vertex_shader; state->vertex_shader = NULL; - device_stream_info_from_declaration(device, &stream_info); + device_stream_info_from_declaration(device, &stream_info, context); state->vertex_shader = vs; /* We can't convert FROM a VBO, and vertex buffers used to source into diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 925b9ca..1d02bfa 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -1957,7 +1957,7 @@ void device_resource_add(struct wined3d_device *device, struct wined3d_resource void device_resource_released(struct wined3d_device *device, struct wined3d_resource *resource) DECLSPEC_HIDDEN; void device_switch_onscreen_ds(struct wined3d_device *device, struct wined3d_context *context, struct wined3d_surface *depth_stencil) DECLSPEC_HIDDEN; -void device_update_stream_info(struct wined3d_device *device, const struct wined3d_gl_info *gl_info) DECLSPEC_HIDDEN; +void device_update_stream_info(struct wined3d_device *device, struct wined3d_context *context) DECLSPEC_HIDDEN; void device_update_tex_unit_map(struct wined3d_device *device) DECLSPEC_HIDDEN; void device_invalidate_state(const struct wined3d_device *device, DWORD state) DECLSPEC_HIDDEN; @@ -2520,7 +2520,7 @@ static inline struct wined3d_buffer *buffer_from_resource(struct wined3d_resourc return CONTAINING_RECORD(resource, struct wined3d_buffer, resource); } -void buffer_get_memory(struct wined3d_buffer *buffer, const struct wined3d_gl_info *gl_info, +void buffer_get_memory(struct wined3d_buffer *buffer, struct wined3d_context *context, struct wined3d_bo_address *data) DECLSPEC_HIDDEN; BYTE *buffer_get_sysmem(struct wined3d_buffer *This, const struct wined3d_gl_info *gl_info) DECLSPEC_HIDDEN;

1 0

Andrew Eikum : oleaut32: Fix TRACE.
by Alexandre Julliard Sept. 9, 2013

Sept. 9, 2013

Module: wine Branch: master Commit: c5be905bf7e5a13fa36d843e229e37808ae8f49a URL: http://source.winehq.org/git/wine.git/?a=commit;h=c5be905bf7e5a13fa36d843e2… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Sep 9 08:45:28 2013 -0500 oleaut32: Fix TRACE. --- dlls/oleaut32/typelib.c | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 476f089..328e28a 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -5357,7 +5357,7 @@ static HRESULT WINAPI ITypeLibComp_fnBind( ITypeLibImpl *This = impl_from_ITypeComp(iface); int typemismatch=0, i; - TRACE("(%s, 0x%x, 0x%x, %p, %p, %p)\n", debugstr_w(szName), lHash, wFlags, ppTInfo, pDescKind, pBindPtr); + TRACE("(%p)->(%s, 0x%x, 0x%x, %p, %p, %p)\n", This, debugstr_w(szName), lHash, wFlags, ppTInfo, pDescKind, pBindPtr); *pDescKind = DESCKIND_NONE; pBindPtr->lptcomp = NULL;

1 0

Andrew Eikum : oleaut32: Typelib strings of size -1 are NULL.
by Alexandre Julliard Sept. 9, 2013

Sept. 9, 2013

Module: wine Branch: master Commit: 808c47cecba0fcd4a9a62b69183e88d20cabbe19 URL: http://source.winehq.org/git/wine.git/?a=commit;h=808c47cecba0fcd4a9a62b691… Author: Andrew Eikum <aeikum(a)codeweavers.com> Date: Mon Sep 9 09:17:23 2013 -0500 oleaut32: Typelib strings of size -1 are NULL. --- dlls/oleaut32/typelib.c | 29 +++++++++++------------------ 1 files changed, 11 insertions(+), 18 deletions(-) diff --git a/dlls/oleaut32/typelib.c b/dlls/oleaut32/typelib.c index 18c1e19..476f089 100644 --- a/dlls/oleaut32/typelib.c +++ b/dlls/oleaut32/typelib.c @@ -2258,24 +2258,17 @@ static void MSFT_ReadValue( VARIANT * pVar, int offset, TLBContext *pcx ) case VT_BSTR :{ char * ptr; MSFT_ReadLEDWords(&size, sizeof(INT), pcx, DO_NOT_SEEK ); - if(size < 0) { - char next; - DWORD origPos = MSFT_Tell(pcx), nullPos; - - do { - MSFT_Read(&next, 1, pcx, DO_NOT_SEEK); - } while (next); - nullPos = MSFT_Tell(pcx); - size = nullPos - origPos; - MSFT_Seek(pcx, origPos); - } - ptr = heap_alloc_zero(size);/* allocate temp buffer */ - MSFT_Read(ptr, size, pcx, DO_NOT_SEEK);/* read string (ANSI) */ - V_BSTR(pVar)=SysAllocStringLen(NULL,size); - /* FIXME: do we need a AtoW conversion here? */ - V_UNION(pVar, bstrVal[size])='\0'; - while(size--) V_UNION(pVar, bstrVal[size])=ptr[size]; - heap_free(ptr); + if(size == -1){ + V_BSTR(pVar) = NULL; + }else{ + ptr = heap_alloc_zero(size); + MSFT_Read(ptr, size, pcx, DO_NOT_SEEK); + V_BSTR(pVar)=SysAllocStringLen(NULL,size); + /* FIXME: do we need a AtoW conversion here? */ + V_UNION(pVar, bstrVal[size])='\0'; + while(size--) V_UNION(pVar, bstrVal[size])=ptr[size]; + heap_free(ptr); + } } size=-4; break; /* FIXME: this will not work AT ALL when the variant contains a pointer */

1 0

Stefan Dösinger : wined3d: Pass the context to the main buffer preload function.
by Alexandre Julliard Sept. 9, 2013

Sept. 9, 2013

Module: wine Branch: master Commit: cd203b38a6d720e6f83b2e098f9882d1b4015f21 URL: http://source.winehq.org/git/wine.git/?a=commit;h=cd203b38a6d720e6f83b2e098… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Sep 9 15:15:37 2013 +0200 wined3d: Pass the context to the main buffer preload function. --- dlls/wined3d/buffer.c | 16 +++++++++------- dlls/wined3d/context.c | 2 +- dlls/wined3d/device.c | 2 +- dlls/wined3d/wined3d_private.h | 2 ++ 4 files changed, 13 insertions(+), 9 deletions(-) diff --git a/dlls/wined3d/buffer.c b/dlls/wined3d/buffer.c index d198ac4..f811a61 100644 --- a/dlls/wined3d/buffer.c +++ b/dlls/wined3d/buffer.c @@ -730,13 +730,13 @@ static void buffer_direct_upload(struct wined3d_buffer *This, const struct wined checkGLcall("glUnmapBufferARB"); } -void CDECL wined3d_buffer_preload(struct wined3d_buffer *buffer) +/* Context activation is done by the caller. */ +void buffer_internal_preload(struct wined3d_buffer *buffer, struct wined3d_context *context) { DWORD flags = buffer->flags & (WINED3D_BUFFER_NOSYNC | WINED3D_BUFFER_DISCARD); struct wined3d_device *device = buffer->resource.device; UINT start = 0, end = 0, len = 0, vertices; const struct wined3d_gl_info *gl_info; - struct wined3d_context *context; BOOL decl_changed = FALSE; unsigned int i, j; BYTE *data; @@ -756,9 +756,7 @@ void CDECL wined3d_buffer_preload(struct wined3d_buffer *buffer) /* TODO: Make converting independent from VBOs */ if (buffer->flags & WINED3D_BUFFER_CREATEBO) { - context = context_acquire(device, NULL); buffer_create_buffer_object(buffer, context); - context_release(context); buffer->flags &= ~WINED3D_BUFFER_CREATEBO; } else @@ -867,14 +865,11 @@ void CDECL wined3d_buffer_preload(struct wined3d_buffer *buffer) return; } - context = context_acquire(device, NULL); buffer_direct_upload(buffer, context->gl_info, flags); - context_release(context); return; } - context = context_acquire(device, NULL); gl_info = context->gl_info; if(!(buffer->flags & WINED3D_BUFFER_DOUBLEBUFFER)) @@ -927,6 +922,13 @@ void CDECL wined3d_buffer_preload(struct wined3d_buffer *buffer) } HeapFree(GetProcessHeap(), 0, data); +} + +void CDECL wined3d_buffer_preload(struct wined3d_buffer *buffer) +{ + struct wined3d_context *context; + context = context_acquire(buffer->resource.device, NULL); + buffer_internal_preload(buffer, context); context_release(context); } diff --git a/dlls/wined3d/context.c b/dlls/wined3d/context.c index da255e8..4a079cf 100644 --- a/dlls/wined3d/context.c +++ b/dlls/wined3d/context.c @@ -2372,7 +2372,7 @@ BOOL context_apply_draw_state(struct wined3d_context *context, struct wined3d_de if (state->index_buffer) { if (device->stream_info.all_vbo) - wined3d_buffer_preload(state->index_buffer); + buffer_internal_preload(state->index_buffer, context); else buffer_get_sysmem(state->index_buffer, context); } diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 3564149..2457771 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -288,7 +288,7 @@ static void device_stream_info_from_declaration(struct wined3d_device *device, s element = &stream_info->elements[i]; buffer = state->streams[element->stream_idx].buffer; - wined3d_buffer_preload(buffer); + buffer_internal_preload(buffer, context); /* If the preload dropped the buffer object, update the stream info. */ if (buffer->buffer_object != element->data.buffer_object) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index a7fa852..3fbad8b 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -2523,6 +2523,8 @@ static inline struct wined3d_buffer *buffer_from_resource(struct wined3d_resourc void buffer_get_memory(struct wined3d_buffer *buffer, struct wined3d_context *context, struct wined3d_bo_address *data) DECLSPEC_HIDDEN; BYTE *buffer_get_sysmem(struct wined3d_buffer *This, struct wined3d_context *context) DECLSPEC_HIDDEN; +void buffer_internal_preload(struct wined3d_buffer *buffer, + struct wined3d_context *context) DECLSPEC_HIDDEN; struct wined3d_rendertarget_view {

1 0

Stefan Dösinger : wined3d: Only invalidate STATE_INDEXBUFFER for the current context in buffer_get_sysmem ().
by Alexandre Julliard Sept. 9, 2013

Sept. 9, 2013

Module: wine Branch: master Commit: 87f931dc64a598c427a07b1d094eaa427adab669 URL: http://source.winehq.org/git/wine.git/?a=commit;h=87f931dc64a598c427a07b1d0… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon Sep 9 15:15:36 2013 +0200 wined3d: Only invalidate STATE_INDEXBUFFER for the current context in buffer_get_sysmem(). --- dlls/wined3d/buffer.c | 12 +++++++----- dlls/wined3d/context.c | 2 +- dlls/wined3d/device.c | 6 +++--- dlls/wined3d/drawprim.c | 24 +++++++++++++----------- dlls/wined3d/state.c | 2 +- dlls/wined3d/wined3d_private.h | 2 +- 6 files changed, 26 insertions(+), 22 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=87f931dc64a598c427a07…

1 0