May 2017 - Wine-Commits - list.winehq.org

Józef Kucia : wined3d: Introduce wined3d_device_get_hs_resource_view().
by Alexandre Julliard May 5, 2017

May 5, 2017

Module: wine Branch: master Commit: d0ece06142a78ae5276aba1bc31bea86bfe94d77 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d0ece06142a78ae5276aba1bc… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri May 5 09:06:26 2017 +0200 wined3d: Introduce wined3d_device_get_hs_resource_view(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 8 ++++++++ dlls/wined3d/wined3d.spec | 1 + include/wine/wined3d.h | 2 ++ 3 files changed, 11 insertions(+) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 1ff0969..ba56c62 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2704,6 +2704,14 @@ void CDECL wined3d_device_set_hs_resource_view(struct wined3d_device *device, wined3d_device_set_shader_resource_view(device, WINED3D_SHADER_TYPE_HULL, idx, view); } +struct wined3d_shader_resource_view * CDECL wined3d_device_get_hs_resource_view(const struct wined3d_device *device, + unsigned int idx) +{ + TRACE("device %p, idx %u.\n", device, idx); + + return wined3d_device_get_shader_resource_view(device, WINED3D_SHADER_TYPE_HULL, idx); +} + void CDECL wined3d_device_set_hs_sampler(struct wined3d_device *device, unsigned int idx, struct wined3d_sampler *sampler) { diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index c8c00c0..d52d96e 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -68,6 +68,7 @@ @ cdecl wined3d_device_get_gs_resource_view(ptr long) @ cdecl wined3d_device_get_gs_sampler(ptr long) @ cdecl wined3d_device_get_hs_cb(ptr long) +@ cdecl wined3d_device_get_hs_resource_view(ptr long) @ cdecl wined3d_device_get_hull_shader(ptr) @ cdecl wined3d_device_get_index_buffer(ptr ptr ptr) @ cdecl wined3d_device_get_light(ptr long ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 70ec52f..9992487 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2224,6 +2224,8 @@ struct wined3d_shader_resource_view * __cdecl wined3d_device_get_gs_resource_vie UINT idx); struct wined3d_sampler * __cdecl wined3d_device_get_gs_sampler(const struct wined3d_device *device, UINT idx); struct wined3d_buffer * __cdecl wined3d_device_get_hs_cb(const struct wined3d_device *device, unsigned int idx); +struct wined3d_shader_resource_view * __cdecl wined3d_device_get_hs_resource_view(const struct wined3d_device *device, + unsigned int idx); struct wined3d_shader * __cdecl wined3d_device_get_hull_shader(const struct wined3d_device *device); struct wined3d_buffer * __cdecl wined3d_device_get_index_buffer(const struct wined3d_device *device, enum wined3d_format_id *format, unsigned int *offset);

1 0

Alexandre Julliard : server: Implement IOCTL_SERIAL_GET_WAIT_MASK as an ioctl on the server side.
by Alexandre Julliard May 5, 2017

May 5, 2017

Module: wine Branch: master Commit: e77873da73cc60acd6fde8509b013045f13a2836 URL: http://source.winehq.org/git/wine.git/?a=commit;h=e77873da73cc60acd6fde8509… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 5 12:34:16 2017 +0200 server: Implement IOCTL_SERIAL_GET_WAIT_MASK as an ioctl on the server side. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/serial.c | 10 +--------- server/serial.c | 7 +++++++ server/trace.c | 1 + 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dlls/ntdll/serial.c b/dlls/ntdll/serial.c index 66facee..29e9faf 100644 --- a/dlls/ntdll/serial.c +++ b/dlls/ntdll/serial.c @@ -1111,6 +1111,7 @@ static inline NTSTATUS io_control(HANDLE hDevice, { case IOCTL_SERIAL_GET_TIMEOUTS: case IOCTL_SERIAL_SET_TIMEOUTS: + case IOCTL_SERIAL_GET_WAIT_MASK: case IOCTL_SERIAL_SET_WAIT_MASK: /* these are handled on the server side */ return STATUS_NOT_SUPPORTED; @@ -1195,15 +1196,6 @@ static inline NTSTATUS io_control(HANDLE hDevice, } else status = STATUS_INVALID_PARAMETER; break; - case IOCTL_SERIAL_GET_WAIT_MASK: - if (lpOutBuffer && nOutBufferSize == sizeof(DWORD)) - { - if (!(status = get_wait_mask(hDevice, lpOutBuffer, NULL, NULL, FALSE))) - sz = sizeof(DWORD); - } - else - status = STATUS_INVALID_PARAMETER; - break; case IOCTL_SERIAL_IMMEDIATE_CHAR: if (lpInBuffer && nInBufferSize == sizeof(CHAR)) status = xmit_immediate(hDevice, fd, lpInBuffer); diff --git a/server/serial.c b/server/serial.c index 8755543..8519473 100644 --- a/server/serial.c +++ b/server/serial.c @@ -220,6 +220,13 @@ static obj_handle_t serial_ioctl( struct fd *fd, ioctl_code_t code, struct async else set_error( STATUS_BUFFER_TOO_SMALL ); return 0; + case IOCTL_SERIAL_GET_WAIT_MASK: + if (get_reply_max_size() >= sizeof(serial->eventmask)) + set_reply_data( &serial->eventmask, sizeof(serial->eventmask) ); + else + set_error( STATUS_BUFFER_TOO_SMALL ); + return 0; + case IOCTL_SERIAL_SET_WAIT_MASK: if (get_req_data_size() >= sizeof(serial->eventmask)) { diff --git a/server/trace.c b/server/trace.c index 4f62ee5..d830e4f 100644 --- a/server/trace.c +++ b/server/trace.c @@ -120,6 +120,7 @@ static void dump_ioctl_code( const char *prefix, const ioctl_code_t *code ) CASE(FSCTL_PIPE_PEEK); CASE(FSCTL_PIPE_WAIT); CASE(IOCTL_SERIAL_GET_TIMEOUTS); + CASE(IOCTL_SERIAL_GET_WAIT_MASK); CASE(IOCTL_SERIAL_SET_TIMEOUTS); CASE(IOCTL_SERIAL_SET_WAIT_MASK); CASE(WS_SIO_ADDRESS_LIST_CHANGE);

1 0

Andrey Gusev : ext-ms-win-authz-context-l1-1-0: Add dll.
by Alexandre Julliard May 5, 2017

May 5, 2017

Module: wine Branch: master Commit: 2f5968875e5e107243c4fa3f499b87e863bdd820 URL: http://source.winehq.org/git/wine.git/?a=commit;h=2f5968875e5e107243c4fa3f4… Author: Andrey Gusev <andrey.goosev(a)gmail.com> Date: Thu May 4 22:54:44 2017 +0300 ext-ms-win-authz-context-l1-1-0: Add dll. Signed-off-by: Andrey Gusev <andrey.goosev(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- configure | 2 ++ configure.ac | 1 + dlls/ext-ms-win-authz-context-l1-1-0/Makefile.in | 1 + .../ext-ms-win-authz-context-l1-1-0.spec | 12 ++++++++++++ tools/make_specfiles | 4 ++++ 5 files changed, 20 insertions(+) diff --git a/configure b/configure index 04d6f54..36ec652 100755 --- a/configure +++ b/configure @@ -1181,6 +1181,7 @@ enable_dxva2 enable_esent enable_evr enable_explorerframe +enable_ext_ms_win_authz_context_l1_1_0 enable_ext_ms_win_domainjoin_netjoin_l1_1_0 enable_ext_ms_win_gdi_dc_create_l1_1_1 enable_ext_ms_win_gdi_dc_l1_2_0 @@ -18014,6 +18015,7 @@ wine_fn_config_dll esent enable_esent wine_fn_config_dll evr enable_evr wine_fn_config_dll explorerframe enable_explorerframe clean wine_fn_config_test dlls/explorerframe/tests explorerframe_test +wine_fn_config_dll ext-ms-win-authz-context-l1-1-0 enable_ext_ms_win_authz_context_l1_1_0 wine_fn_config_dll ext-ms-win-domainjoin-netjoin-l1-1-0 enable_ext_ms_win_domainjoin_netjoin_l1_1_0 wine_fn_config_dll ext-ms-win-gdi-dc-create-l1-1-1 enable_ext_ms_win_gdi_dc_create_l1_1_1 wine_fn_config_dll ext-ms-win-gdi-dc-l1-2-0 enable_ext_ms_win_gdi_dc_l1_2_0 diff --git a/configure.ac b/configure.ac index 1431fb6..0f0e013 100644 --- a/configure.ac +++ b/configure.ac @@ -3043,6 +3043,7 @@ WINE_CONFIG_DLL(esent) WINE_CONFIG_DLL(evr) WINE_CONFIG_DLL(explorerframe,,[clean]) WINE_CONFIG_TEST(dlls/explorerframe/tests) +WINE_CONFIG_DLL(ext-ms-win-authz-context-l1-1-0) WINE_CONFIG_DLL(ext-ms-win-domainjoin-netjoin-l1-1-0) WINE_CONFIG_DLL(ext-ms-win-gdi-dc-create-l1-1-1) WINE_CONFIG_DLL(ext-ms-win-gdi-dc-l1-2-0) diff --git a/dlls/ext-ms-win-authz-context-l1-1-0/Makefile.in b/dlls/ext-ms-win-authz-context-l1-1-0/Makefile.in new file mode 100644 index 0000000..7731bfe --- /dev/null +++ b/dlls/ext-ms-win-authz-context-l1-1-0/Makefile.in @@ -0,0 +1 @@ +MODULE = ext-ms-win-authz-context-l1-1-0.dll diff --git a/dlls/ext-ms-win-authz-context-l1-1-0/ext-ms-win-authz-context-l1-1-0.spec b/dlls/ext-ms-win-authz-context-l1-1-0/ext-ms-win-authz-context-l1-1-0.spec new file mode 100644 index 0000000..1bce6d3 --- /dev/null +++ b/dlls/ext-ms-win-authz-context-l1-1-0/ext-ms-win-authz-context-l1-1-0.spec @@ -0,0 +1,12 @@ +@ stub AuthzFreeAuditEvent +@ stdcall AuthzFreeContext(long) authz.AuthzFreeContext +@ stub AuthzFreeResourceManager +@ stub AuthziFreeAuditEventType +@ stub AuthziInitializeAuditEvent +@ stub AuthziInitializeAuditEventType +@ stub AuthziInitializeAuditParams +@ stub AuthziLogAuditEvent +@ stub AuthzInitializeContextFromAuthzContext +@ stdcall AuthzInitializeContextFromSid(long ptr long ptr int64 ptr ptr) authz.AuthzInitializeContextFromSid +@ stdcall AuthzInitializeContextFromToken(long long long ptr int64 ptr ptr) authz.AuthzInitializeContextFromToken +@ stdcall AuthzInitializeResourceManager(long ptr ptr ptr wstr ptr) authz.AuthzInitializeResourceManager diff --git a/tools/make_specfiles b/tools/make_specfiles index a9b0c32..280954d 100755 --- a/tools/make_specfiles +++ b/tools/make_specfiles @@ -139,6 +139,10 @@ my @dll_groups = "api-ms-win-service-winsvc-l1-2-0", ], [ + "authz", + "ext-ms-win-authz-context-l1-1-0", + ], + [ "netapi32", "ext-ms-win-domainjoin-netjoin-l1-1-0", ],

1 0

Alexandre Julliard : server: Implement IOCTL_SERIAL_GET_TIMEOUTS as an ioctl on the server side.
by Alexandre Julliard May 5, 2017

May 5, 2017

Module: wine Branch: master Commit: a682420b58af834d85c23ef68e440754ff5ccba0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=a682420b58af834d85c23ef68… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 5 12:18:55 2017 +0200 server: Implement IOCTL_SERIAL_GET_TIMEOUTS as an ioctl on the server side. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ntdll/serial.c | 29 +---------------------------- include/wine/server_protocol.h | 8 ++------ server/protocol.def | 5 ----- server/request.h | 13 ++++--------- server/serial.c | 38 ++++++++++++++++++++++++++++++-------- server/trace.c | 10 ++++------ 6 files changed, 41 insertions(+), 62 deletions(-) diff --git a/dlls/ntdll/serial.c b/dlls/ntdll/serial.c index 91d9be9..f0a574a 100644 --- a/dlls/ntdll/serial.c +++ b/dlls/ntdll/serial.c @@ -390,26 +390,6 @@ static NTSTATUS get_status(int fd, SERIAL_STATUS* ss) return status; } -static NTSTATUS get_timeouts(HANDLE handle, SERIAL_TIMEOUTS* st) -{ - NTSTATUS status; - SERVER_START_REQ( get_serial_info ) - { - req->handle = wine_server_obj_handle( handle ); - req->flags = 0; - if (!(status = wine_server_call( req ))) - { - st->ReadIntervalTimeout = reply->readinterval; - st->ReadTotalTimeoutMultiplier = reply->readmult; - st->ReadTotalTimeoutConstant = reply->readconst; - st->WriteTotalTimeoutMultiplier = reply->writemult; - st->WriteTotalTimeoutConstant = reply->writeconst; - } - } - SERVER_END_REQ; - return status; -} - static void stop_waiting( HANDLE handle ) { NTSTATUS status; @@ -1245,14 +1225,7 @@ static inline NTSTATUS io_control(HANDLE hDevice, else status = STATUS_INVALID_PARAMETER; break; case IOCTL_SERIAL_GET_TIMEOUTS: - if (lpOutBuffer && nOutBufferSize == sizeof(SERIAL_TIMEOUTS)) - { - if (!(status = get_timeouts(hDevice, lpOutBuffer))) - sz = sizeof(SERIAL_TIMEOUTS); - } - else - status = STATUS_INVALID_PARAMETER; - break; + return STATUS_NOT_SUPPORTED; case IOCTL_SERIAL_GET_WAIT_MASK: if (lpOutBuffer && nOutBufferSize == sizeof(DWORD)) { diff --git a/include/wine/server_protocol.h b/include/wine/server_protocol.h index bfdf22f..10c0504 100644 --- a/include/wine/server_protocol.h +++ b/include/wine/server_protocol.h @@ -3151,14 +3151,10 @@ struct get_serial_info_request struct get_serial_info_reply { struct reply_header __header; - unsigned int readinterval; - unsigned int readconst; - unsigned int readmult; - unsigned int writeconst; - unsigned int writemult; unsigned int eventmask; unsigned int cookie; unsigned int pending_write; + char __pad_20[4]; }; @@ -6407,6 +6403,6 @@ union generic_reply struct terminate_job_reply terminate_job_reply; }; -#define SERVER_PROTOCOL_VERSION 527 +#define SERVER_PROTOCOL_VERSION 528 #endif /* __WINE_WINE_SERVER_PROTOCOL_H */ diff --git a/server/protocol.def b/server/protocol.def index 87285a4..b1e4234 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -2299,11 +2299,6 @@ enum message_type obj_handle_t handle; /* handle to comm port */ int flags; @REPLY - unsigned int readinterval; - unsigned int readconst; - unsigned int readmult; - unsigned int writeconst; - unsigned int writemult; unsigned int eventmask; unsigned int cookie; unsigned int pending_write; diff --git a/server/request.h b/server/request.h index 41016bd..7600c31 100644 --- a/server/request.h +++ b/server/request.h @@ -1553,15 +1553,10 @@ C_ASSERT( sizeof(struct is_window_hung_reply) == 16 ); C_ASSERT( FIELD_OFFSET(struct get_serial_info_request, handle) == 12 ); C_ASSERT( FIELD_OFFSET(struct get_serial_info_request, flags) == 16 ); C_ASSERT( sizeof(struct get_serial_info_request) == 24 ); -C_ASSERT( FIELD_OFFSET(struct get_serial_info_reply, readinterval) == 8 ); -C_ASSERT( FIELD_OFFSET(struct get_serial_info_reply, readconst) == 12 ); -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( FIELD_OFFSET(struct get_serial_info_reply, cookie) == 32 ); -C_ASSERT( FIELD_OFFSET(struct get_serial_info_reply, pending_write) == 36 ); -C_ASSERT( sizeof(struct get_serial_info_reply) == 40 ); +C_ASSERT( FIELD_OFFSET(struct get_serial_info_reply, eventmask) == 8 ); +C_ASSERT( FIELD_OFFSET(struct get_serial_info_reply, cookie) == 12 ); +C_ASSERT( FIELD_OFFSET(struct get_serial_info_reply, pending_write) == 16 ); +C_ASSERT( sizeof(struct get_serial_info_reply) == 24 ); 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 fea3c8c..b398cc1 100644 --- a/server/serial.c +++ b/server/serial.c @@ -50,6 +50,8 @@ #define WIN32_NO_STATUS #include "windef.h" #include "winternl.h" +#include "winioctl.h" +#include "ddk/ntddser.h" #include "file.h" #include "handle.h" @@ -61,6 +63,7 @@ static struct fd *serial_get_fd( struct object *obj ); static void serial_destroy(struct object *obj); static enum server_fd_type serial_get_fd_type( struct fd *fd ); +static obj_handle_t serial_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ); static void serial_queue_async( struct fd *fd, struct async *async, int type, int count ); static void serial_reselect_async( struct fd *fd, struct async_queue *queue ); @@ -118,7 +121,7 @@ static const struct fd_ops serial_fd_ops = no_fd_read, /* read */ no_fd_write, /* write */ no_fd_flush, /* flush */ - default_fd_ioctl, /* ioctl */ + serial_ioctl, /* ioctl */ serial_queue_async, /* queue_async */ serial_reselect_async /* reselect_async */ }; @@ -183,6 +186,32 @@ static enum server_fd_type serial_get_fd_type( struct fd *fd ) return FD_TYPE_SERIAL; } +static obj_handle_t serial_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ) +{ + struct serial *serial = get_fd_user( fd ); + + switch (code) + { + case IOCTL_SERIAL_GET_TIMEOUTS: + if (get_reply_max_size() >= sizeof(SERIAL_TIMEOUTS)) + { + SERIAL_TIMEOUTS *timeouts = set_reply_data_size( sizeof(*timeouts )); + + timeouts->ReadIntervalTimeout = serial->readinterval; + timeouts->ReadTotalTimeoutConstant = serial->readconst; + timeouts->ReadTotalTimeoutMultiplier = serial->readmult; + timeouts->WriteTotalTimeoutConstant = serial->writeconst; + timeouts->WriteTotalTimeoutMultiplier = serial->writemult; + } + else set_error( STATUS_BUFFER_TOO_SMALL ); + return 0; + + default: + set_error( STATUS_NOT_SUPPORTED ); + return 0; + } +} + static void serial_queue_async( struct fd *fd, struct async *async, int type, int count ) { struct serial *serial = get_fd_user( fd ); @@ -252,13 +281,6 @@ DECL_HANDLER(get_serial_info) serial->pending_wait = 1; } - /* timeouts */ - reply->readinterval = serial->readinterval; - reply->readconst = serial->readconst; - reply->readmult = serial->readmult; - reply->writeconst = serial->writeconst; - reply->writemult = serial->writemult; - /* event mask */ reply->eventmask = serial->eventmask; reply->cookie = serial->generation; diff --git a/server/trace.c b/server/trace.c index fc7fd35..5e13dad 100644 --- a/server/trace.c +++ b/server/trace.c @@ -39,6 +39,7 @@ #include "winuser.h" #include "winioctl.h" #include "ddk/wdm.h" +#include "ddk/ntddser.h" #define USE_WS_PREFIX #include "winsock2.h" #include "file.h" @@ -116,7 +117,9 @@ static void dump_ioctl_code( const char *prefix, const ioctl_code_t *code ) CASE(FSCTL_DISMOUNT_VOLUME); CASE(FSCTL_PIPE_DISCONNECT); CASE(FSCTL_PIPE_LISTEN); + CASE(FSCTL_PIPE_PEEK); CASE(FSCTL_PIPE_WAIT); + CASE(IOCTL_SERIAL_GET_TIMEOUTS); CASE(WS_SIO_ADDRESS_LIST_CHANGE); default: fprintf( stderr, "%s%08x", prefix, *code ); break; #undef CASE @@ -2830,12 +2833,7 @@ static void dump_get_serial_info_request( const struct get_serial_info_request * static void dump_get_serial_info_reply( const struct get_serial_info_reply *req ) { - fprintf( stderr, " readinterval=%08x", req->readinterval ); - fprintf( stderr, ", readconst=%08x", req->readconst ); - fprintf( stderr, ", readmult=%08x", req->readmult ); - fprintf( stderr, ", writeconst=%08x", req->writeconst ); - fprintf( stderr, ", writemult=%08x", req->writemult ); - fprintf( stderr, ", eventmask=%08x", req->eventmask ); + fprintf( stderr, " eventmask=%08x", req->eventmask ); fprintf( stderr, ", cookie=%08x", req->cookie ); fprintf( stderr, ", pending_write=%08x", req->pending_write ); }

1 0

Józef Kucia : wined3d: Introduce wined3d_device_get_ds_resource_view().
by Alexandre Julliard May 5, 2017

May 5, 2017

Module: wine Branch: master Commit: 4b87ac3713c7f0295ac27aeeb49e886fa16fae41 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4b87ac3713c7f0295ac27aeeb… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri May 5 09:06:28 2017 +0200 wined3d: Introduce wined3d_device_get_ds_resource_view(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 8 ++++++++ dlls/wined3d/wined3d.spec | 1 + include/wine/wined3d.h | 2 ++ 3 files changed, 11 insertions(+) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index ba56c62..b12dca6 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2766,6 +2766,14 @@ void CDECL wined3d_device_set_ds_resource_view(struct wined3d_device *device, wined3d_device_set_shader_resource_view(device, WINED3D_SHADER_TYPE_DOMAIN, idx, view); } +struct wined3d_shader_resource_view * CDECL wined3d_device_get_ds_resource_view(const struct wined3d_device *device, + unsigned int idx) +{ + TRACE("device %p, idx %u.\n", device, idx); + + return wined3d_device_get_shader_resource_view(device, WINED3D_SHADER_TYPE_DOMAIN, idx); +} + void CDECL wined3d_device_set_ds_sampler(struct wined3d_device *device, unsigned int idx, struct wined3d_sampler *sampler) { diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index d52d96e..dc74f7e 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -62,6 +62,7 @@ @ cdecl wined3d_device_get_display_mode(ptr long ptr ptr) @ cdecl wined3d_device_get_domain_shader(ptr) @ cdecl wined3d_device_get_ds_cb(ptr long) +@ cdecl wined3d_device_get_ds_resource_view(ptr long) @ cdecl wined3d_device_get_gamma_ramp(ptr long ptr) @ cdecl wined3d_device_get_geometry_shader(ptr) @ cdecl wined3d_device_get_gs_cb(ptr long) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 9992487..17af079 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2216,6 +2216,8 @@ HRESULT __cdecl wined3d_device_get_display_mode(const struct wined3d_device *dev struct wined3d_display_mode *mode, enum wined3d_display_rotation *rotation); struct wined3d_shader * __cdecl wined3d_device_get_domain_shader(const struct wined3d_device *device); struct wined3d_buffer * __cdecl wined3d_device_get_ds_cb(const struct wined3d_device *device, unsigned int idx); +struct wined3d_shader_resource_view * __cdecl wined3d_device_get_ds_resource_view(const struct wined3d_device *device, + unsigned int idx); void __cdecl wined3d_device_get_gamma_ramp(const struct wined3d_device *device, UINT swapchain_idx, struct wined3d_gamma_ramp *ramp); struct wined3d_shader * __cdecl wined3d_device_get_geometry_shader(const struct wined3d_device *device);

1 0

Michael Stefaniuc : dmusic/tests: Add some IDirectMusic_SetDirectSound() tests.
by Alexandre Julliard May 5, 2017

May 5, 2017

Module: wine Branch: master Commit: cf943820eb88e01e3b237ded9f07547473ff824d URL: http://source.winehq.org/git/wine.git/?a=commit;h=cf943820eb88e01e3b237ded9… Author: Michael Stefaniuc <mstefani(a)winehq.org> Date: Fri May 5 01:07:00 2017 +0200 dmusic/tests: Add some IDirectMusic_SetDirectSound() tests. Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/dmusic/tests/Makefile.in | 2 +- dlls/dmusic/tests/dmusic.c | 73 +++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 74 insertions(+), 1 deletion(-) diff --git a/dlls/dmusic/tests/Makefile.in b/dlls/dmusic/tests/Makefile.in index e9721ca..2f8d6a8 100644 --- a/dlls/dmusic/tests/Makefile.in +++ b/dlls/dmusic/tests/Makefile.in @@ -1,5 +1,5 @@ TESTDLL = dmusic.dll -IMPORTS = oleaut32 ole32 uuid +IMPORTS = oleaut32 ole32 uuid user32 dsound C_SRCS = \ dmusic.c diff --git a/dlls/dmusic/tests/dmusic.c b/dlls/dmusic/tests/dmusic.c index 0a1eca6..8473a40 100644 --- a/dlls/dmusic/tests/dmusic.c +++ b/dlls/dmusic/tests/dmusic.c @@ -122,6 +122,78 @@ static void test_dmusic(void) IDirectMusic_Release(dmusic); } +static ULONG get_refcount(IDirectSound *iface) +{ + IDirectSound_AddRef(iface); + return IDirectSound_Release(iface); +} + +static void test_setdsound(void) +{ + IDirectMusic *dmusic; + IDirectSound *dsound, *dsound2; + HRESULT hr; + ULONG ref; + + /* Old dsound without SetCooperativeLevel() */ + hr = DirectSoundCreate(NULL, &dsound, NULL); + if (hr == DSERR_NODRIVER ) { + skip("No driver\n"); + return; + } + ok(hr == S_OK, "DirectSoundCreate failed: %08x\n", hr); + hr = CoCreateInstance(&CLSID_DirectMusic, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusic8, + (void **)&dmusic); + ok(hr == S_OK, "DirectMusic create failed: %08x\n", hr); + hr = IDirectMusic_SetDirectSound(dmusic, dsound, NULL); + ok(hr == S_OK, "SetDirectSound failed: %08x\n", hr); + IDirectMusic_Release(dmusic); + IDirectSound_Release(dsound); + + /* dsound ref counting */ + hr = CoCreateInstance(&CLSID_DirectMusic, NULL, CLSCTX_INPROC_SERVER, &IID_IDirectMusic8, + (void **)&dmusic); + ok(hr == S_OK, "DirectMusic create failed: %08x\n", hr); + hr = DirectSoundCreate8(NULL, (IDirectSound8 **)&dsound, NULL); + ok(hr == S_OK, "DirectSoundCreate failed: %08x\n", hr); + hr = IDirectSound_SetCooperativeLevel(dsound, GetForegroundWindow(), DSSCL_PRIORITY); + ok(hr == S_OK, "SetCooperativeLevel failed: %08x\n", hr); + hr = IDirectMusic_SetDirectSound(dmusic, dsound, NULL); + ok(hr == S_OK, "SetDirectSound failed: %08x\n", hr); + ref = get_refcount(dsound); + todo_wine ok(ref == 2, "dsound ref count got %d expected 2\n", ref); + + /* Releasing dsound from dmusic */ + hr = IDirectMusic_SetDirectSound(dmusic, NULL, NULL); + ok(hr == S_OK, "SetDirectSound failed: %08x\n", hr); + ref = get_refcount(dsound); + ok(ref == 1, "dsound ref count got %d expected 1\n", ref); + + /* Setting the same dsound twice */ + hr = IDirectMusic_SetDirectSound(dmusic, dsound, NULL); + ok(hr == S_OK, "SetDirectSound failed: %08x\n", hr); + ref = get_refcount(dsound); + todo_wine ok(ref == 2, "dsound ref count got %d expected 2\n", ref); + hr = IDirectMusic_SetDirectSound(dmusic, dsound, NULL); + ok(hr == S_OK, "SetDirectSound failed: %08x\n", hr); + ref = get_refcount(dsound); + todo_wine ok(ref == 2, "dsound ref count got %d expected 2\n", ref); + + /* Replacing one dsound with another */ + hr = DirectSoundCreate8(NULL, (IDirectSound8 **)&dsound2, NULL); + ok(hr == S_OK, "DirectSoundCreate failed: %08x\n", hr); + hr = IDirectMusic_SetDirectSound(dmusic, dsound2, NULL); + ok(hr == S_OK, "SetDirectSound failed: %08x\n", hr); + ref = get_refcount(dsound); + ok(ref == 1, "dsound ref count got %d expected 1\n", ref); + ref = get_refcount(dsound2); + todo_wine ok(ref == 2, "dsound2 ref count got %d expected 2\n", ref); + + IDirectMusic_Release(dmusic); + IDirectSound_Release(dsound); + IDirectSound_Release(dsound2); +} + static void test_dmbuffer(void) { IDirectMusic *dmusic; @@ -450,6 +522,7 @@ START_TEST(dmusic) test_COM_dmcoll(); test_COM_synthport(); test_dmusic(); + test_setdsound(); test_dmbuffer(); test_dmcoll();

1 0

Józef Kucia : d3d11: Implement d3d11_immediate_context_HSGetSamplers().
by Alexandre Julliard May 5, 2017

May 5, 2017

Module: wine Branch: master Commit: 06d3244d2404e8f99329bf1b365db4aee02a75de URL: http://source.winehq.org/git/wine.git/?a=commit;h=06d3244d2404e8f99329bf1b3… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri May 5 09:06:31 2017 +0200 d3d11: Implement d3d11_immediate_context_HSGetSamplers(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/device.c | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index 0a432be..f4e540c 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -2078,8 +2078,28 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_HSGetShader(ID3D11DeviceCo static void STDMETHODCALLTYPE d3d11_immediate_context_HSGetSamplers(ID3D11DeviceContext *iface, UINT start_slot, UINT sampler_count, ID3D11SamplerState **samplers) { - FIXME("iface %p, start_slot %u, sampler_count %u, samplers %p stub!\n", + struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface); + unsigned int i; + + TRACE("iface %p, start_slot %u, sampler_count %u, samplers %p.\n", iface, start_slot, sampler_count, samplers); + + wined3d_mutex_lock(); + for (i = 0; i < sampler_count; ++i) + { + struct wined3d_sampler *wined3d_sampler; + struct d3d_sampler_state *sampler_impl; + + if (!(wined3d_sampler = wined3d_device_get_hs_sampler(device->wined3d_device, start_slot + i))) + { + samplers[i] = NULL; + continue; + } + + sampler_impl = wined3d_sampler_get_parent(wined3d_sampler); + ID3D11SamplerState_AddRef(samplers[i] = &sampler_impl->ID3D11SamplerState_iface); + } + wined3d_mutex_unlock(); } static void STDMETHODCALLTYPE d3d11_immediate_context_HSGetConstantBuffers(ID3D11DeviceContext *iface,

1 0

Józef Kucia : wined3d: Introduce wined3d_device_get_hs_sampler().
by Alexandre Julliard May 5, 2017

May 5, 2017

Module: wine Branch: master Commit: 0efb3e40e4c5ff40aa800ac4df7b58db13fba350 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0efb3e40e4c5ff40aa800ac4d… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri May 5 09:06:30 2017 +0200 wined3d: Introduce wined3d_device_get_hs_sampler(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/device.c | 7 +++++++ dlls/wined3d/wined3d.spec | 1 + include/wine/wined3d.h | 1 + 3 files changed, 9 insertions(+) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index b12dca6..b5f07cb 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -2720,6 +2720,13 @@ void CDECL wined3d_device_set_hs_sampler(struct wined3d_device *device, wined3d_device_set_sampler(device, WINED3D_SHADER_TYPE_HULL, idx, sampler); } +struct wined3d_sampler * CDECL wined3d_device_get_hs_sampler(const struct wined3d_device *device, unsigned int idx) +{ + TRACE("device %p, idx %u.\n", device, idx); + + return wined3d_device_get_sampler(device, WINED3D_SHADER_TYPE_HULL, idx); +} + void CDECL wined3d_device_set_domain_shader(struct wined3d_device *device, struct wined3d_shader *shader) { struct wined3d_shader *prev; diff --git a/dlls/wined3d/wined3d.spec b/dlls/wined3d/wined3d.spec index dc74f7e..a90c215 100644 --- a/dlls/wined3d/wined3d.spec +++ b/dlls/wined3d/wined3d.spec @@ -70,6 +70,7 @@ @ cdecl wined3d_device_get_gs_sampler(ptr long) @ cdecl wined3d_device_get_hs_cb(ptr long) @ cdecl wined3d_device_get_hs_resource_view(ptr long) +@ cdecl wined3d_device_get_hs_sampler(ptr long) @ cdecl wined3d_device_get_hull_shader(ptr) @ cdecl wined3d_device_get_index_buffer(ptr ptr ptr) @ cdecl wined3d_device_get_light(ptr long ptr) diff --git a/include/wine/wined3d.h b/include/wine/wined3d.h index 17af079..d54666e 100644 --- a/include/wine/wined3d.h +++ b/include/wine/wined3d.h @@ -2228,6 +2228,7 @@ struct wined3d_sampler * __cdecl wined3d_device_get_gs_sampler(const struct wine struct wined3d_buffer * __cdecl wined3d_device_get_hs_cb(const struct wined3d_device *device, unsigned int idx); struct wined3d_shader_resource_view * __cdecl wined3d_device_get_hs_resource_view(const struct wined3d_device *device, unsigned int idx); +struct wined3d_sampler * __cdecl wined3d_device_get_hs_sampler(const struct wined3d_device *device, unsigned int idx); struct wined3d_shader * __cdecl wined3d_device_get_hull_shader(const struct wined3d_device *device); struct wined3d_buffer * __cdecl wined3d_device_get_index_buffer(const struct wined3d_device *device, enum wined3d_format_id *format, unsigned int *offset);

1 0

Józef Kucia : d3d11: Implement d3d11_immediate_context_HSGetShaderResources().
by Alexandre Julliard May 5, 2017

May 5, 2017

Module: wine Branch: master Commit: 6bffee6f67acf70e4973e776f98eba62dd4d3b33 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6bffee6f67acf70e4973e776f… Author: Józef Kucia <jkucia(a)codeweavers.com> Date: Fri May 5 09:06:27 2017 +0200 d3d11: Implement d3d11_immediate_context_HSGetShaderResources(). Signed-off-by: Józef Kucia <jkucia(a)codeweavers.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3d11/device.c | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/dlls/d3d11/device.c b/dlls/d3d11/device.c index d80b635..91d09bf 100644 --- a/dlls/d3d11/device.c +++ b/dlls/d3d11/device.c @@ -2026,7 +2026,27 @@ static void STDMETHODCALLTYPE d3d11_immediate_context_RSGetScissorRects(ID3D11De static void STDMETHODCALLTYPE d3d11_immediate_context_HSGetShaderResources(ID3D11DeviceContext *iface, UINT start_slot, UINT view_count, ID3D11ShaderResourceView **views) { - FIXME("iface %p, start_slot %u, view_count %u, views %p stub!\n", iface, start_slot, view_count, views); + struct d3d_device *device = device_from_immediate_ID3D11DeviceContext(iface); + unsigned int i; + + TRACE("iface %p, start_slot %u, view_count %u, views %p.\n", iface, start_slot, view_count, views); + + wined3d_mutex_lock(); + for (i = 0; i < view_count; ++i) + { + struct wined3d_shader_resource_view *wined3d_view; + struct d3d_shader_resource_view *view_impl; + + if (!(wined3d_view = wined3d_device_get_hs_resource_view(device->wined3d_device, start_slot + i))) + { + views[i] = NULL; + continue; + } + + view_impl = wined3d_shader_resource_view_get_parent(wined3d_view); + ID3D11ShaderResourceView_AddRef(views[i] = &view_impl->ID3D11ShaderResourceView_iface); + } + wined3d_mutex_unlock(); } static void STDMETHODCALLTYPE d3d11_immediate_context_HSGetShader(ID3D11DeviceContext *iface,

1 0

Alexandre Julliard : server: Store the SERIAL_TIMEOUTS structure directly in the object.
by Alexandre Julliard May 5, 2017

May 5, 2017

Module: wine Branch: master Commit: c43f13c3e4ddb538f9be27aca867de2b143283b5 URL: http://source.winehq.org/git/wine.git/?a=commit;h=c43f13c3e4ddb538f9be27aca… Author: Alexandre Julliard <julliard(a)winehq.org> Date: Fri May 5 14:10:44 2017 +0200 server: Store the SERIAL_TIMEOUTS structure directly in the object. Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/serial.c | 55 ++++++++++++++++--------------------------------------- 1 file changed, 16 insertions(+), 39 deletions(-) diff --git a/server/serial.c b/server/serial.c index 8519473..fb29288 100644 --- a/server/serial.c +++ b/server/serial.c @@ -73,14 +73,7 @@ struct serial struct fd *fd; struct timeout_user *read_timer; - - /* timeout values */ - unsigned int readinterval; - unsigned int readconst; - unsigned int readmult; - unsigned int writeconst; - unsigned int writemult; - + SERIAL_TIMEOUTS timeouts; unsigned int eventmask; unsigned int generation; /* event mask change counter */ unsigned int pending_write : 1; @@ -142,15 +135,11 @@ struct object *create_serial( struct fd *fd ) if (!(serial = alloc_object( &serial_ops ))) return NULL; serial->read_timer = NULL; - serial->readinterval = 0; - serial->readmult = 0; - serial->readconst = 0; - serial->writemult = 0; - serial->writeconst = 0; serial->eventmask = 0; serial->generation = 0; serial->pending_write = 0; serial->pending_wait = 0; + memset( &serial->timeouts, 0, sizeof(serial->timeouts) ); serial->fd = (struct fd *)grab_object( fd ); set_fd_user( fd, &serial_fd_ops, &serial->obj ); return &serial->obj; @@ -193,31 +182,17 @@ static obj_handle_t serial_ioctl( struct fd *fd, ioctl_code_t code, struct async switch (code) { case IOCTL_SERIAL_GET_TIMEOUTS: - if (get_reply_max_size() >= sizeof(SERIAL_TIMEOUTS)) - { - SERIAL_TIMEOUTS *timeouts = set_reply_data_size( sizeof(*timeouts )); - - timeouts->ReadIntervalTimeout = serial->readinterval; - timeouts->ReadTotalTimeoutConstant = serial->readconst; - timeouts->ReadTotalTimeoutMultiplier = serial->readmult; - timeouts->WriteTotalTimeoutConstant = serial->writeconst; - timeouts->WriteTotalTimeoutMultiplier = serial->writemult; - } - else set_error( STATUS_BUFFER_TOO_SMALL ); + if (get_reply_max_size() >= sizeof(serial->timeouts)) + set_reply_data( &serial->timeouts, sizeof(serial->timeouts )); + else + set_error( STATUS_BUFFER_TOO_SMALL ); return 0; case IOCTL_SERIAL_SET_TIMEOUTS: - if (get_req_data_size() >= sizeof(SERIAL_TIMEOUTS)) - { - const SERIAL_TIMEOUTS *timeouts = get_req_data(); - - serial->readinterval = timeouts->ReadIntervalTimeout; - serial->readconst = timeouts->ReadTotalTimeoutConstant; - serial->readmult = timeouts->ReadTotalTimeoutMultiplier; - serial->writeconst = timeouts->WriteTotalTimeoutConstant; - serial->writemult = timeouts->WriteTotalTimeoutMultiplier; - } - else set_error( STATUS_BUFFER_TOO_SMALL ); + if (get_req_data_size() >= sizeof(serial->timeouts)) + memcpy( &serial->timeouts, get_req_data(), sizeof(serial->timeouts) ); + else + set_error( STATUS_BUFFER_TOO_SMALL ); return 0; case IOCTL_SERIAL_GET_WAIT_MASK: @@ -253,10 +228,12 @@ static void serial_queue_async( struct fd *fd, struct async *async, int type, in switch (type) { case ASYNC_TYPE_READ: - timeout = serial->readconst + (timeout_t)serial->readmult*count; + timeout = serial->timeouts.ReadTotalTimeoutConstant + + (timeout_t)serial->timeouts.ReadTotalTimeoutMultiplier * count; break; case ASYNC_TYPE_WRITE: - timeout = serial->writeconst + (timeout_t)serial->writemult*count; + timeout = serial->timeouts.WriteTotalTimeoutConstant + + (timeout_t)serial->timeouts.WriteTotalTimeoutMultiplier * count; break; } @@ -287,9 +264,9 @@ static void serial_reselect_async( struct fd *fd, struct async_queue *queue ) serial->read_timer = NULL; } } - else if (serial->readinterval && (default_fd_get_poll_events( fd ) & POLLIN)) + else if (serial->timeouts.ReadIntervalTimeout && (default_fd_get_poll_events( fd ) & POLLIN)) { - serial->read_timer = add_timeout_user( (timeout_t)serial->readinterval * -10000, + serial->read_timer = add_timeout_user( (timeout_t)serial->timeouts.ReadIntervalTimeout * -10000, serial_read_timeout, serial ); } default_fd_reselect_async( fd, queue );

1 0