November 2018 - Wine-commits

Alexandre Julliard : server: Return a WSA error code in create_socket.
by Alexandre Julliard 20 Nov '18

20 Nov '18

Module: wine Branch: master Commit: 424a379f641465cde3b3a8a5e9a39e5865f926f2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=424a379f641465cde3b3a8a5… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 20 14:50:21 2018 +0100 server: Return a WSA error code in create_socket. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 11 +---------- dlls/ws2_32/tests/sock.c | 1 - server/sock.c | 5 ++--- server/trace.c | 43 +++++++++++++++++++++++++++++++++++++++++++ tools/make_requests | 4 ++++ 5 files changed, 50 insertions(+), 14 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index c6805d8..2207586 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -7619,7 +7619,7 @@ SOCKET WINAPI WSASocketW(int af, int type, int protocol, req->access = GENERIC_READ|GENERIC_WRITE|SYNCHRONIZE; req->attributes = (dwFlags & WSA_FLAG_NO_HANDLE_INHERIT) ? 0 : OBJ_INHERIT; req->flags = dwFlags & ~WSA_FLAG_NO_HANDLE_INHERIT; - set_error( wine_server_call( req ) ); + err = NtStatusToWSAError( wine_server_call( req ) ); ret = HANDLE2SOCKET( wine_server_ptr_handle( reply->handle )); } SERVER_END_REQ; @@ -7655,7 +7655,6 @@ SOCKET WINAPI WSASocketW(int af, int type, int protocol, return ret; } - err = GetLastError(); if (err == WSAEACCES) /* raw socket denied */ { if (type == SOCK_RAW) @@ -7663,14 +7662,6 @@ SOCKET WINAPI WSASocketW(int af, int type, int protocol, else ERR_(winediag)("Failed to create socket, this requires special permissions.\n"); } - else - { - /* invalid combination of valid parameters, like SOCK_STREAM + IPPROTO_UDP */ - if (err == WSAEINVAL) - err = WSAESOCKTNOSUPPORT; - else if (err == WSAEOPNOTSUPP) - err = WSAEPROTONOSUPPORT; - } done: WARN("\t\tfailed, error %d!\n", err); diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index c058869..b32d1c0 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -2773,7 +2773,6 @@ static void test_WSASocket(void) if (sock == INVALID_SOCKET) { err = WSAGetLastError(); -todo_wine ok(err == WSAEAFNOSUPPORT || broken(err == WSAEPROTONOSUPPORT), "Expected 10047, received %d\n", err); skip("IPX is not supported\n"); } diff --git a/server/sock.c b/server/sock.c index 3be24b3..6620b51 100644 --- a/server/sock.c +++ b/server/sock.c @@ -661,11 +661,10 @@ static struct object *create_socket( int family, int type, int protocol, unsigne int sockfd; sockfd = socket( family, type, protocol ); - if (debug_level) - fprintf(stderr,"socket(%d,%d,%d)=%d\n",family,type,protocol,sockfd); if (sockfd == -1) { - sock_set_error(); + if (errno == EINVAL) set_win32_error( WSAESOCKTNOSUPPORT ); + else set_win32_error( sock_get_error( errno )); return NULL; } fcntl(sockfd, F_SETFL, O_NONBLOCK); /* make socket nonblocking */ diff --git a/server/trace.c b/server/trace.c index 9a84067..41bbe4a 100644 --- a/server/trace.c +++ b/server/trace.c @@ -5549,6 +5549,49 @@ static const struct { "USER_MAPPED_FILE", STATUS_USER_MAPPED_FILE }, { "VOLUME_DISMOUNTED", STATUS_VOLUME_DISMOUNTED }, { "WAS_LOCKED", STATUS_WAS_LOCKED }, + { "WSAEACCES", 0xc0010000 | WSAEACCES }, + { "WSAEADDRINUSE", 0xc0010000 | WSAEADDRINUSE }, + { "WSAEADDRNOTAVAIL", 0xc0010000 | WSAEADDRNOTAVAIL }, + { "WSAEAFNOSUPPORT", 0xc0010000 | WSAEAFNOSUPPORT }, + { "WSAEALREADY", 0xc0010000 | WSAEALREADY }, + { "WSAEBADF", 0xc0010000 | WSAEBADF }, + { "WSAECONNABORTED", 0xc0010000 | WSAECONNABORTED }, + { "WSAECONNREFUSED", 0xc0010000 | WSAECONNREFUSED }, + { "WSAECONNRESET", 0xc0010000 | WSAECONNRESET }, + { "WSAEDESTADDRREQ", 0xc0010000 | WSAEDESTADDRREQ }, + { "WSAEDQUOT", 0xc0010000 | WSAEDQUOT }, + { "WSAEFAULT", 0xc0010000 | WSAEFAULT }, + { "WSAEHOSTDOWN", 0xc0010000 | WSAEHOSTDOWN }, + { "WSAEHOSTUNREACH", 0xc0010000 | WSAEHOSTUNREACH }, + { "WSAEINPROGRESS", 0xc0010000 | WSAEINPROGRESS }, + { "WSAEINTR", 0xc0010000 | WSAEINTR }, + { "WSAEINVAL", 0xc0010000 | WSAEINVAL }, + { "WSAEISCONN", 0xc0010000 | WSAEISCONN }, + { "WSAELOOP", 0xc0010000 | WSAELOOP }, + { "WSAEMFILE", 0xc0010000 | WSAEMFILE }, + { "WSAEMSGSIZE", 0xc0010000 | WSAEMSGSIZE }, + { "WSAENAMETOOLONG", 0xc0010000 | WSAENAMETOOLONG }, + { "WSAENETDOWN", 0xc0010000 | WSAENETDOWN }, + { "WSAENETRESET", 0xc0010000 | WSAENETRESET }, + { "WSAENETUNREACH", 0xc0010000 | WSAENETUNREACH }, + { "WSAENOBUFS", 0xc0010000 | WSAENOBUFS }, + { "WSAENOPROTOOPT", 0xc0010000 | WSAENOPROTOOPT }, + { "WSAENOTCONN", 0xc0010000 | WSAENOTCONN }, + { "WSAENOTEMPTY", 0xc0010000 | WSAENOTEMPTY }, + { "WSAENOTSOCK", 0xc0010000 | WSAENOTSOCK }, + { "WSAEOPNOTSUPP", 0xc0010000 | WSAEOPNOTSUPP }, + { "WSAEPFNOSUPPORT", 0xc0010000 | WSAEPFNOSUPPORT }, + { "WSAEPROCLIM", 0xc0010000 | WSAEPROCLIM }, + { "WSAEPROTONOSUPPORT", 0xc0010000 | WSAEPROTONOSUPPORT }, + { "WSAEPROTOTYPE", 0xc0010000 | WSAEPROTOTYPE }, + { "WSAEREMOTE", 0xc0010000 | WSAEREMOTE }, + { "WSAESHUTDOWN", 0xc0010000 | WSAESHUTDOWN }, + { "WSAESOCKTNOSUPPORT", 0xc0010000 | WSAESOCKTNOSUPPORT }, + { "WSAESTALE", 0xc0010000 | WSAESTALE }, + { "WSAETIMEDOUT", 0xc0010000 | WSAETIMEDOUT }, + { "WSAETOOMANYREFS", 0xc0010000 | WSAETOOMANYREFS }, + { "WSAEUSERS", 0xc0010000 | WSAEUSERS }, + { "WSAEWOULDBLOCK", 0xc0010000 | WSAEWOULDBLOCK }, { NULL, 0 } }; diff --git a/tools/make_requests b/tools/make_requests index 3a81f36..367f245 100755 --- a/tools/make_requests +++ b/tools/make_requests @@ -298,6 +298,10 @@ sub GET_ERROR_NAMES() { $errors{$1} = "0xc0010000 | $1"; } + while (/\breturn\s+(WSA\w+)/g) + { + $errors{$1} = "0xc0010000 | $1"; + } } close FILE; }

1 0

Alexandre Julliard : server: Return a WSA error code in WS_SIO_ADDRESS_LIST_CHANGE.
by Alexandre Julliard 20 Nov '18

20 Nov '18

Module: wine Branch: master Commit: 49babc0bad9dae9c2b7e209aa2e374f502e246c9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=49babc0bad9dae9c2b7e209a… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 20 15:29:29 2018 +0100 server: Return a WSA error code in WS_SIO_ADDRESS_LIST_CHANGE. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/sock.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/server/sock.c b/server/sock.c index 6620b51..a9bd55a 100644 --- a/server/sock.c +++ b/server/sock.c @@ -547,7 +547,7 @@ static int sock_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ) case WS_SIO_ADDRESS_LIST_CHANGE: if ((sock->state & FD_WINE_NONBLOCKING) && async_is_blocking( async )) { - set_error( STATUS_CANT_WAIT ); + set_win32_error( WSAEWOULDBLOCK ); return 0; } if (!sock_get_ifchange( sock )) return 0; @@ -1097,7 +1097,7 @@ static void ifchange_poll_event( struct fd *fd, int event ) unix_fd = socket( PF_NETLINK, SOCK_RAW, NETLINK_ROUTE ); if (unix_fd == -1) { - sock_set_error(); + set_win32_error( sock_get_error( errno )); return NULL; } fcntl( unix_fd, F_SETFL, O_NONBLOCK ); /* make socket nonblocking */ @@ -1108,7 +1108,7 @@ static void ifchange_poll_event( struct fd *fd, int event ) if (bind( unix_fd, (struct sockaddr *)&addr, sizeof(addr) ) == -1) { close( unix_fd ); - sock_set_error(); + set_win32_error( sock_get_error( errno )); return NULL; } if (!(ifchange = alloc_object( &ifchange_ops )))

1 0

Alexandre Julliard : server: Return a WSA error code in accept_socket.
by Alexandre Julliard 20 Nov '18

20 Nov '18

Module: wine Branch: master Commit: 70073ff2d04e96a262e0e8bc59406e3572af4781 URL: https://source.winehq.org/git/wine.git/?a=commit;h=70073ff2d04e96a262e0e8bc… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Tue Nov 20 15:53:30 2018 +0100 server: Return a WSA error code in accept_socket. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 29 ++++++++++++++--------------- server/sock.c | 21 +++++---------------- 2 files changed, 19 insertions(+), 31 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 2207586..640726d 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -2521,7 +2521,7 @@ static NTSTATUS WS2_async_accept( void *user, IO_STATUS_BLOCK *iosb, NTSTATUS st } SERVER_END_REQ; - if (status == STATUS_CANT_WAIT) + if (NtStatusToWSAError( status ) == WSAEWOULDBLOCK) return STATUS_PENDING; if (status == STATUS_INVALID_HANDLE) @@ -2760,9 +2760,9 @@ static int WS2_register_async_shutdown( SOCKET s, int type ) */ SOCKET WINAPI WS_accept(SOCKET s, struct WS_sockaddr *addr, int *addrlen32) { - NTSTATUS status; DWORD err; SOCKET as; + int fd; BOOL is_blocking; TRACE("socket %04lx\n", s ); @@ -2770,18 +2770,19 @@ SOCKET WINAPI WS_accept(SOCKET s, struct WS_sockaddr *addr, int *addrlen32) if (err) goto error; - do { + for (;;) + { /* try accepting first (if there is a deferred connection) */ SERVER_START_REQ( accept_socket ) { req->lhandle = wine_server_obj_handle( SOCKET2HANDLE(s) ); req->access = GENERIC_READ|GENERIC_WRITE|SYNCHRONIZE; req->attributes = OBJ_INHERIT; - status = wine_server_call( req ); + err = NtStatusToWSAError( wine_server_call( req )); as = HANDLE2SOCKET( wine_server_ptr_handle( reply->handle )); } SERVER_END_REQ; - if (!status) + if (!err) { if (addr && addrlen32 && WS_getpeername(as, addr, addrlen32)) { @@ -2791,16 +2792,14 @@ SOCKET WINAPI WS_accept(SOCKET s, struct WS_sockaddr *addr, int *addrlen32) TRACE("\taccepted %04lx\n", as); return as; } - if (is_blocking && status == STATUS_CANT_WAIT) - { - int fd = get_sock_fd( s, FILE_READ_DATA, NULL ); - /* block here */ - do_block(fd, POLLIN, -1); - _sync_sock_state(s); /* let wineserver notice connection */ - release_sock_fd( s, fd ); - } - } while (is_blocking && status == STATUS_CANT_WAIT); - err = NtStatusToWSAError( status ); + if (!is_blocking) break; + if (err != WSAEWOULDBLOCK) break; + fd = get_sock_fd( s, FILE_READ_DATA, NULL ); + /* block here */ + do_block(fd, POLLIN, -1); + _sync_sock_state(s); /* let wineserver notice connection */ + release_sock_fd( s, fd ); + } error: WARN(" -> ERROR %d\n", err); diff --git a/server/sock.c b/server/sock.c index a9bd55a..284ab9f 100644 --- a/server/sock.c +++ b/server/sock.c @@ -135,7 +135,6 @@ static void sock_reselect_async( struct fd *fd, struct async_queue *queue ); static int sock_get_ntstatus( int err ); static unsigned int sock_get_error( int err ); -static void sock_set_error(void); static const struct object_ops sock_ops = { @@ -699,17 +698,13 @@ static int accept_new_fd( struct sock *sock ) * or that accept() is allowed on it. In those cases we will get -1/errno * return. */ - int acceptfd; struct sockaddr saddr; socklen_t slen = sizeof(saddr); - acceptfd = accept( get_unix_fd(sock->fd), &saddr, &slen); - if (acceptfd == -1) - { - sock_set_error(); - return acceptfd; - } - - fcntl(acceptfd, F_SETFL, O_NONBLOCK); /* make socket nonblocking */ + int acceptfd = accept( get_unix_fd(sock->fd), &saddr, &slen ); + if (acceptfd != -1) + fcntl( acceptfd, F_SETFL, O_NONBLOCK ); + else + set_win32_error( sock_get_error( errno )); return acceptfd; } @@ -936,12 +931,6 @@ static int sock_get_ntstatus( int err ) } } -/* set the last error depending on errno */ -static void sock_set_error(void) -{ - set_error( sock_get_ntstatus( errno ) ); -} - #ifdef HAVE_LINUX_RTNETLINK_H /* only keep one ifchange object around, all sockets waiting for wakeups will look to it */

1 0

Hans Leidekker : msi: Increase MSI_INITIAL_MEDIA_TRANSFORM_DISKID to avoid conflicts.
by Alexandre Julliard 20 Nov '18

20 Nov '18

Module: wine Branch: master Commit: 49e9fa376ca1ab251a0b5ccc506b255a93071bc2 URL: https://source.winehq.org/git/wine.git/?a=commit;h=49e9fa376ca1ab251a0b5ccc… Author: Hans Leidekker <hans(a)codeweavers.com> Date: Tue Nov 20 13:42:22 2018 +0100 msi: Increase MSI_INITIAL_MEDIA_TRANSFORM_DISKID to avoid conflicts. Signed-off-by: Hans Leidekker <hans(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msi/msipriv.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msi/msipriv.h b/dlls/msi/msipriv.h index 1ea6b77..f9263b5 100644 --- a/dlls/msi/msipriv.h +++ b/dlls/msi/msipriv.h @@ -81,7 +81,7 @@ struct tagMSIOBJECTHDR }; #define MSI_INITIAL_MEDIA_TRANSFORM_OFFSET 10000 -#define MSI_INITIAL_MEDIA_TRANSFORM_DISKID 30000 +#define MSI_INITIAL_MEDIA_TRANSFORM_DISKID 32000 typedef struct tagMSISTREAM {

1 0

Henri Verbeet : d3d8: Disallow index buffers in the scratch pool.
by Alexandre Julliard 20 Nov '18

20 Nov '18

Module: wine Branch: master Commit: 28324c5be9e59f852ae4231d1a0af9ee3a0eedfb URL: https://source.winehq.org/git/wine.git/?a=commit;h=28324c5be9e59f852ae4231d… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Nov 20 16:54:41 2018 +0330 d3d8: Disallow index buffers in the scratch pool. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/buffer.c | 3 +++ dlls/d3d8/tests/device.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/d3d8/buffer.c b/dlls/d3d8/buffer.c index 9534c33..475bf48 100644 --- a/dlls/d3d8/buffer.c +++ b/dlls/d3d8/buffer.c @@ -573,6 +573,9 @@ HRESULT indexbuffer_init(struct d3d8_indexbuffer *buffer, struct d3d8_device *de struct wined3d_buffer_desc desc; HRESULT hr; + if (pool == D3DPOOL_SCRATCH) + return D3DERR_INVALIDCALL; + desc.byte_width = size; desc.usage = (usage & WINED3DUSAGE_MASK) | WINED3DUSAGE_STATICDECL; if (pool == D3DPOOL_SCRATCH) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index c07e981..c99ed0e 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -9132,7 +9132,7 @@ static void test_resource_access(void) hr = IDirect3DDevice8_CreateIndexBuffer(device, 16, tests[i].usage, tests[i].format == FORMAT_COLOUR ? D3DFMT_INDEX32 : D3DFMT_INDEX16, tests[i].pool, &ib); - todo_wine_if(tests[i].pool == D3DPOOL_SCRATCH || tests[i].usage & ~D3DUSAGE_DYNAMIC) + todo_wine_if(tests[i].pool != D3DPOOL_SCRATCH && tests[i].usage & ~D3DUSAGE_DYNAMIC) ok(hr == (tests[i].pool == D3DPOOL_SCRATCH || (tests[i].usage & ~D3DUSAGE_DYNAMIC) ? D3DERR_INVALIDCALL : D3D_OK), "Test %u: Got unexpected hr %#x.\n", i, hr); if (FAILED(hr))

1 0

Henri Verbeet : d3d9: Disallow index buffers in the scratch pool.
by Alexandre Julliard 20 Nov '18

20 Nov '18

Module: wine Branch: master Commit: 2843e4d3cf119e60329391740fbda5f9fd08febd URL: https://source.winehq.org/git/wine.git/?a=commit;h=2843e4d3cf119e6032939174… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Nov 20 16:54:42 2018 +0330 d3d9: Disallow index buffers in the scratch pool. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/buffer.c | 3 +++ dlls/d3d9/tests/device.c | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/d3d9/buffer.c b/dlls/d3d9/buffer.c index ea98ef4..b870107 100644 --- a/dlls/d3d9/buffer.c +++ b/dlls/d3d9/buffer.c @@ -572,6 +572,9 @@ HRESULT indexbuffer_init(struct d3d9_indexbuffer *buffer, struct d3d9_device *de struct wined3d_buffer_desc desc; HRESULT hr; + if (pool == D3DPOOL_SCRATCH) + return D3DERR_INVALIDCALL; + desc.byte_width = size; desc.usage = (usage & WINED3DUSAGE_MASK) | WINED3DUSAGE_STATICDECL; if (pool == D3DPOOL_SCRATCH) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index 9f293a8..d0e5660 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -12967,7 +12967,7 @@ static void test_resource_access(void) hr = IDirect3DDevice9_CreateIndexBuffer(device, 16, tests[i].usage, tests[i].format == FORMAT_COLOUR ? D3DFMT_INDEX32 : D3DFMT_INDEX16, tests[i].pool, &ib, NULL); - todo_wine_if(tests[i].pool == D3DPOOL_SCRATCH || tests[i].usage & ~D3DUSAGE_DYNAMIC) + todo_wine_if(tests[i].pool != D3DPOOL_SCRATCH && tests[i].usage & ~D3DUSAGE_DYNAMIC) ok(hr == (tests[i].pool == D3DPOOL_SCRATCH || (tests[i].usage & ~D3DUSAGE_DYNAMIC) ? D3DERR_INVALIDCALL : D3D_OK), "Test %u: Got unexpected hr %#x.\n", i, hr); if (FAILED(hr))

1 0

Henri Verbeet : d3d8: Disallow rendertarget and depth/ stencil usage on 3D textures.
by Alexandre Julliard 20 Nov '18

20 Nov '18

Module: wine Branch: master Commit: fc97073e2a3043bcf0624f924cd43f178337ec96 URL: https://source.winehq.org/git/wine.git/?a=commit;h=fc97073e2a3043bcf0624f92… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Nov 20 16:54:43 2018 +0330 d3d8: Disallow rendertarget and depth/stencil usage on 3D textures. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d8/tests/device.c | 6 ++---- dlls/d3d8/texture.c | 4 ++++ 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/d3d8/tests/device.c b/dlls/d3d8/tests/device.c index c99ed0e..8ac6ed7 100644 --- a/dlls/d3d8/tests/device.c +++ b/dlls/d3d8/tests/device.c @@ -9091,10 +9091,8 @@ static void test_resource_access(void) hr = IDirect3DDevice8_CreateVolumeTexture(device, 16, 16, 1, 1, tests[i].usage, format, tests[i].pool, &texture); - todo_wine_if(tests[i].usage & D3DUSAGE_RENDERTARGET - && !(tests[i].usage & D3DUSAGE_DYNAMIC) && tests[i].pool == D3DPOOL_DEFAULT) - ok(hr == (!(tests[i].usage & ~D3DUSAGE_DYNAMIC) ? D3D_OK : D3DERR_INVALIDCALL), - "Test %u: Got unexpected hr %#x.\n", i, hr); + ok(hr == (!(tests[i].usage & ~D3DUSAGE_DYNAMIC) ? D3D_OK : D3DERR_INVALIDCALL), + "Test %u: Got unexpected hr %#x.\n", i, hr); if (FAILED(hr)) continue; diff --git a/dlls/d3d8/texture.c b/dlls/d3d8/texture.c index ec5ae03..ccbf60e 100644 --- a/dlls/d3d8/texture.c +++ b/dlls/d3d8/texture.c @@ -1186,6 +1186,10 @@ HRESULT volumetexture_init(struct d3d8_texture *texture, struct d3d8_device *dev struct wined3d_resource_desc desc; HRESULT hr; + /* In d3d8, 3D textures can't be used as rendertarget or depth/stencil buffer. */ + if (usage & (D3DUSAGE_RENDERTARGET | D3DUSAGE_DEPTHSTENCIL)) + return D3DERR_INVALIDCALL; + texture->IDirect3DBaseTexture8_iface.lpVtbl = (const IDirect3DBaseTexture8Vtbl *)&Direct3DVolumeTexture8_Vtbl; d3d8_resource_init(&texture->resource); list_init(&texture->rtv_list);

1 0

Henri Verbeet : d3d9: Disallow rendertarget and depth/ stencil usage on 3D textures.
by Alexandre Julliard 20 Nov '18

20 Nov '18

Module: wine Branch: master Commit: c3c98ed4a9abf01573d91ddeef65d71c34d682b1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=c3c98ed4a9abf01573d91dde… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Tue Nov 20 16:54:44 2018 +0330 d3d9: Disallow rendertarget and depth/stencil usage on 3D textures. Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d9/tests/device.c | 6 ++---- dlls/d3d9/texture.c | 4 ++++ 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/dlls/d3d9/tests/device.c b/dlls/d3d9/tests/device.c index d0e5660..af0e8a0 100644 --- a/dlls/d3d9/tests/device.c +++ b/dlls/d3d9/tests/device.c @@ -12926,10 +12926,8 @@ static void test_resource_access(void) hr = IDirect3DDevice9_CreateVolumeTexture(device, 16, 16, 1, 1, tests[i].usage, format, tests[i].pool, &texture, NULL); - todo_wine_if(tests[i].usage & D3DUSAGE_RENDERTARGET - && !(tests[i].usage & D3DUSAGE_DYNAMIC) && tests[i].pool == D3DPOOL_DEFAULT) - ok(hr == (!(tests[i].usage & ~D3DUSAGE_DYNAMIC) ? D3D_OK : D3DERR_INVALIDCALL), - "Test %u: Got unexpected hr %#x.\n", i, hr); + ok(hr == (!(tests[i].usage & ~D3DUSAGE_DYNAMIC) ? D3D_OK : D3DERR_INVALIDCALL), + "Test %u: Got unexpected hr %#x.\n", i, hr); if (FAILED(hr)) continue; diff --git a/dlls/d3d9/texture.c b/dlls/d3d9/texture.c index 4855985..e652416 100644 --- a/dlls/d3d9/texture.c +++ b/dlls/d3d9/texture.c @@ -1453,6 +1453,10 @@ HRESULT volumetexture_init(struct d3d9_texture *texture, struct d3d9_device *dev struct wined3d_resource_desc desc; HRESULT hr; + /* In d3d9, 3D textures can't be used as rendertarget or depth/stencil buffer. */ + if (usage & (D3DUSAGE_RENDERTARGET | D3DUSAGE_DEPTHSTENCIL)) + return D3DERR_INVALIDCALL; + texture->IDirect3DBaseTexture9_iface.lpVtbl = (const IDirect3DBaseTexture9Vtbl *)&d3d9_texture_3d_vtbl; d3d9_resource_init(&texture->resource); list_init(&texture->rtv_list);

1 0

Paul Gofman : wined3d: Don' t pull _ACCESS_GPU textures to system memory in texture2d_blt().
by Alexandre Julliard 20 Nov '18

20 Nov '18

Module: wine Branch: master Commit: 4aecfe2e055c2c8ad56db3d2a62037d8fef0a00c URL: https://source.winehq.org/git/wine.git/?a=commit;h=4aecfe2e055c2c8ad56db3d2… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Tue Nov 20 15:20:44 2018 +0300 wined3d: Don't pull _ACCESS_GPU textures to system memory in texture2d_blt(). The change introduced by commit 54a9e84952ce8f566f79ab92930faf84bad0cfc1 had side effect of ultimately selecting detsination texture location as dst_texture->resource.map_binding, which is not the case in the default texture2d_blt() code path. Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46068 Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/surface.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/dlls/wined3d/surface.c b/dlls/wined3d/surface.c index 5f5c53a..18542e1 100644 --- a/dlls/wined3d/surface.c +++ b/dlls/wined3d/surface.c @@ -3275,7 +3275,8 @@ HRESULT texture2d_blt(struct wined3d_texture *dst_texture, unsigned int dst_sub_ } } else if (!(src_sub_resource->locations & surface_simple_locations) - && (dst_sub_resource->locations & dst_texture->resource.map_binding)) + && (dst_sub_resource->locations & dst_texture->resource.map_binding) + && !(dst_texture->resource.access & WINED3D_RESOURCE_ACCESS_GPU)) { /* Download */ if (scale)

1 0

Michael Stefaniuc : xaudio2_7: Use the ARRAY_SIZE() macro.
by Alexandre Julliard 20 Nov '18

20 Nov '18

Module: wine Branch: master Commit: 47fbcece36cad190c4d18f7636df67d1382b7545 URL: https://source.winehq.org/git/wine.git/?a=commit;h=47fbcece36cad190c4d18f76… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri Nov 16 21:50:38 2018 +0100 xaudio2_7: Use the ARRAY_SIZE() macro. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Andrew Eikum <aeikum(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/xaudio2_7/compat.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/xaudio2_7/compat.c b/dlls/xaudio2_7/compat.c index b9f4166..4980e25 100644 --- a/dlls/xaudio2_7/compat.c +++ b/dlls/xaudio2_7/compat.c @@ -2102,7 +2102,7 @@ static HRESULT WINAPI XA20_GetDeviceDetails(IXAudio20 *iface, UINT32 index, goto done; } - lstrcpynW(pDeviceDetails->DisplayName, var.u.pwszVal, sizeof(pDeviceDetails->DisplayName)/sizeof(WCHAR)); + lstrcpynW(pDeviceDetails->DisplayName, var.u.pwszVal, ARRAY_SIZE(pDeviceDetails->DisplayName)); PropVariantClear(&var); @@ -2385,7 +2385,7 @@ static HRESULT WINAPI XA22_GetDeviceDetails(IXAudio22 *iface, UINT32 index, goto done; } - lstrcpynW(pDeviceDetails->DisplayName, var.u.pwszVal, sizeof(pDeviceDetails->DisplayName)/sizeof(WCHAR)); + lstrcpynW(pDeviceDetails->DisplayName, var.u.pwszVal, ARRAY_SIZE(pDeviceDetails->DisplayName)); PropVariantClear(&var); @@ -2667,7 +2667,7 @@ static HRESULT WINAPI XA27_GetDeviceDetails(IXAudio27 *iface, UINT32 index, goto done; } - lstrcpynW(pDeviceDetails->DisplayName, var.u.pwszVal, sizeof(pDeviceDetails->DisplayName)/sizeof(WCHAR)); + lstrcpynW(pDeviceDetails->DisplayName, var.u.pwszVal, ARRAY_SIZE(pDeviceDetails->DisplayName)); PropVariantClear(&var);

1 0