November 2018 - Wine-Commits

Piotr Caban : ucrtbase: Fix wrong function calls in misc tests.
by Alexandre Julliard Nov. 20, 2018

Nov. 20, 2018

Module: wine Branch: master Commit: 78ef7515832fc266cbfbecc7a8048d1dad8584d4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=78ef7515832fc266cbfbecc7… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Nov 20 01:00:36 2018 +0100 ucrtbase: Fix wrong function calls in misc tests. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ucrtbase/tests/misc.c | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/dlls/ucrtbase/tests/misc.c b/dlls/ucrtbase/tests/misc.c index 2251863..65e308c 100644 --- a/dlls/ucrtbase/tests/misc.c +++ b/dlls/ucrtbase/tests/misc.c @@ -118,6 +118,7 @@ static int (CDECL *p__ltoa_s)(LONG, char*, size_t, int); static char* (CDECL *p__get_narrow_winmain_command_line)(void); static int (CDECL *p_sopen_dispatch)(const char *, int, int, int, int *, int); static int (CDECL *p_sopen_s)(int *, const char *, int, int, int); +static int (WINAPIV *p__open)(const char*, int, ...); static MSVCRT_lldiv_t* (CDECL *p_lldiv)(MSVCRT_lldiv_t*,LONGLONG,LONGLONG); static int (CDECL *p__isctype)(int,int); static int (CDECL *p_isblank)(int); @@ -134,6 +135,7 @@ static int (CDECL *p__crt_atexit)(void (CDECL*)(void)); static int (__cdecl *p_crt_at_quick_exit)(void (__cdecl *func)(void)); static void (__cdecl *p_quick_exit)(int exitcode); static int (__cdecl *p__stat32)(const char*, struct _stat32 *buf); +static int (__cdecl *p__close)(int); static void test__initialize_onexit_table(void) { @@ -476,6 +478,7 @@ static BOOL init(void) p__get_narrow_winmain_command_line = (void*)GetProcAddress(GetModuleHandleA("ucrtbase.dll"), "_get_narrow_winmain_command_line"); p_sopen_dispatch = (void*)GetProcAddress(module, "_sopen_dispatch"); p_sopen_s = (void*)GetProcAddress(module, "_sopen_s"); + p__open = (void*)GetProcAddress(module, "_open"); p_lldiv = (void*)GetProcAddress(module, "lldiv"); p__isctype = (void*)GetProcAddress(module, "_isctype"); p_isblank = (void*)GetProcAddress(module, "isblank"); @@ -492,6 +495,7 @@ static BOOL init(void) p_crt_at_quick_exit = (void*)GetProcAddress(module, "_crt_at_quick_exit"); p_quick_exit = (void*)GetProcAddress(module, "quick_exit"); p__stat32 = (void*)GetProcAddress(module, "_stat32"); + p__close = (void*)GetProcAddress(module, "_close"); return TRUE; } @@ -507,7 +511,7 @@ static void test__sopen_dispatch(void) ret = p_sopen_dispatch(tempf, _O_CREAT, _SH_DENYWR, 0xff, &fd, 0); ok(!ret, "got %d\n", ret); ok(fd > 0, "got fd %d\n", fd); - _close(fd); + p__close(fd); unlink(tempf); p__set_invalid_parameter_handler(global_invalid_parameter_handler); @@ -520,7 +524,7 @@ static void test__sopen_dispatch(void) CHECK_CALLED(global_invalid_parameter_handler); if (fd > 0) { - _close(fd); + p__close(fd); unlink(tempf); } @@ -540,13 +544,13 @@ static void test__sopen_s(void) ret = p_sopen_s(&fd, tempf, _O_CREAT, _SH_DENYWR, 0); ok(!ret, "got %d\n", ret); ok(fd > 0, "got fd %d\n", fd); - _close(fd); + p__close(fd); unlink(tempf); /* _open() does not validate pmode */ - fd = _open(tempf, _O_CREAT, 0xff); + fd = p__open(tempf, _O_CREAT, 0xff); ok(fd > 0, "got fd %d\n", fd); - _close(fd); + p__close(fd); unlink(tempf); p__set_invalid_parameter_handler(global_invalid_parameter_handler);

1 0

Piotr Caban : ucrtbase: Add _o_malloc implementation.
by Alexandre Julliard Nov. 20, 2018

Nov. 20, 2018

Module: wine Branch: master Commit: 25bb3b0be587cdc91f9e24765be4fc42738bdae4 URL: https://source.winehq.org/git/wine.git/?a=commit;h=25bb3b0be587cdc91f9e2476… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Tue Nov 20 01:00:41 2018 +0100 ucrtbase: Add _o_malloc implementation. Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- .../api-ms-win-crt-private-l1-1-0.spec | 2 +- dlls/ucrtbase/tests/misc.c | 21 +++++++++++++++++++++ dlls/ucrtbase/ucrtbase.spec | 2 +- 3 files changed, 23 insertions(+), 2 deletions(-) diff --git a/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec b/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec index 9fc7723..60a9258 100644 --- a/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec +++ b/dlls/api-ms-win-crt-private-l1-1-0/api-ms-win-crt-private-l1-1-0.spec @@ -1015,7 +1015,7 @@ @ stub _o_lround @ stub _o_lroundf @ stub _o_lroundl -@ stub _o_malloc +@ cdecl _o_malloc(long) ucrtbase._o_malloc @ stub _o_mblen @ stub _o_mbrlen @ stub _o_mbrtoc16 diff --git a/dlls/ucrtbase/tests/misc.c b/dlls/ucrtbase/tests/misc.c index 65e308c..ddb7938 100644 --- a/dlls/ucrtbase/tests/misc.c +++ b/dlls/ucrtbase/tests/misc.c @@ -136,6 +136,9 @@ static int (__cdecl *p_crt_at_quick_exit)(void (__cdecl *func)(void)); static void (__cdecl *p_quick_exit)(int exitcode); static int (__cdecl *p__stat32)(const char*, struct _stat32 *buf); static int (__cdecl *p__close)(int); +static void* (__cdecl *p__o_malloc)(size_t); +static size_t (__cdecl *p__msize)(void*); +static void (__cdecl *p_free)(void*); static void test__initialize_onexit_table(void) { @@ -496,6 +499,9 @@ static BOOL init(void) p_quick_exit = (void*)GetProcAddress(module, "quick_exit"); p__stat32 = (void*)GetProcAddress(module, "_stat32"); p__close = (void*)GetProcAddress(module, "_close"); + p__o_malloc = (void*)GetProcAddress(module, "_o_malloc"); + p__msize = (void*)GetProcAddress(module, "_msize"); + p_free = (void*)GetProcAddress(module, "free"); return TRUE; } @@ -1034,6 +1040,20 @@ static void test__stat32(void) } } +static void test__o_malloc(void) +{ + void *m; + size_t s; + + m = p__o_malloc(1); + ok(m != NULL, "p__o_malloc(1) returned NULL\n"); + + s = p__msize(m); + ok(s == 1, "_msize returned %d\n", (int)s); + + p_free(m); +} + START_TEST(misc) { int arg_c; @@ -1068,4 +1088,5 @@ START_TEST(misc) test_exit(arg_v[0]); test_quick_exit(arg_v[0]); test__stat32(); + test__o_malloc(); } diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec index 34e6b0e..6e6cc43 100644 --- a/dlls/ucrtbase/ucrtbase.spec +++ b/dlls/ucrtbase/ucrtbase.spec @@ -1706,7 +1706,7 @@ @ stub _o_lround @ stub _o_lroundf @ stub _o_lroundl -@ stub _o_malloc +@ cdecl _o_malloc(long) MSVCRT_malloc @ stub _o_mblen @ stub _o_mbrlen @ stub _o_mbrtoc16

1 0

Alexandre Julliard : server: Return a WSA error code in accept_socket.
by Alexandre Julliard Nov. 20, 2018

Nov. 20, 2018

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 Nov. 20, 2018

Nov. 20, 2018

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 Nov. 20, 2018

Nov. 20, 2018

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 : d3d8: Disallow rendertarget and depth/ stencil usage on 3D textures.
by Alexandre Julliard Nov. 20, 2018

Nov. 20, 2018

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

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

Nov. 20, 2018

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

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

Nov. 20, 2018

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

Alexandre Julliard : server: Return a WSA error code in WS_SIO_ADDRESS_LIST_CHANGE.
by Alexandre Julliard Nov. 20, 2018

Nov. 20, 2018

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

Józef Kucia : widl: Guard RPC includes with #ifdef _WIN32.
by Alexandre Julliard Nov. 20, 2018

Nov. 20, 2018

Module: wine Branch: master Commit: b7402ddbbecdfaa81daa657fbb5d37661f401434 URL: https://source.winehq.org/git/wine.git/?a=commit;h=b7402ddbbecdfaa81daa657f… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Mon Nov 19 15:07:02 2018 +0100 widl: Guard RPC includes with #ifdef _WIN32. This makes it easier to use header files generated by widl without Windows headers. Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/widl/header.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tools/widl/header.c b/tools/widl/header.c index defc7f8..ef141d9 100644 --- a/tools/widl/header.c +++ b/tools/widl/header.c @@ -1784,15 +1784,15 @@ void write_header(const statement_list_t *stmts) } fprintf(header, "/*** Autogenerated by WIDL %s from %s - Do not edit ***/\n\n", PACKAGE_VERSION, input_name); + fprintf(header, "#ifdef _WIN32\n"); fprintf(header, "#ifndef __REQUIRED_RPCNDR_H_VERSION__\n"); fprintf(header, "#define __REQUIRED_RPCNDR_H_VERSION__ 475\n"); - fprintf(header, "#endif\n\n"); - + fprintf(header, "#endif\n"); fprintf(header, "#include <rpc.h>\n" ); fprintf(header, "#include <rpcndr.h>\n" ); if (!for_each_serializable(stmts, NULL, serializable_exists)) fprintf(header, "#include <midles.h>\n" ); - fprintf(header, "\n" ); + fprintf(header, "#endif\n\n"); fprintf(header, "#ifndef COM_NO_WINDOWS_H\n"); fprintf(header, "#include <windows.h>\n");

1 0