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

Zebediah Figura : server: Poll for FD_CLOSE even if we cannot receive more data.
by Alexandre Julliard May 14, 2021

May 14, 2021

Module: wine Branch: master Commit: aa6b2482ccf08a699e14d00aad2e2ffd040218dd URL: https://source.winehq.org/git/wine.git/?a=commit;h=aa6b2482ccf08a699e14d00a… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu May 13 22:54:35 2021 -0500 server: Poll for FD_CLOSE even if we cannot receive more data. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/tests/sock.c | 6 +++--- server/sock.c | 3 +-- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 266ddc14451..9116c2b169d 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -4455,12 +4455,12 @@ static void test_close_events(struct event_test_ctx *ctx) check_events(ctx, 0, 0, 0); select_events(ctx, server, FD_ACCEPT | FD_CLOSE | FD_CONNECT | FD_OOB | FD_READ); if (ctx->is_message) - check_events_todo_msg(ctx, FD_CLOSE, 0, 200); + check_events(ctx, FD_CLOSE, 0, 200); check_events(ctx, 0, 0, 0); select_events(ctx, server, 0); select_events(ctx, server, FD_ACCEPT | FD_CLOSE | FD_CONNECT | FD_OOB | FD_READ); if (ctx->is_message) - check_events_todo_msg(ctx, FD_CLOSE, 0, 200); + check_events(ctx, FD_CLOSE, 0, 200); check_events(ctx, 0, 0, 0); ret = recv(server, buffer, 5, 0); @@ -4553,7 +4553,7 @@ static void test_close_events(struct event_test_ctx *ctx) check_events(ctx, 0, 0, 200); select_events(ctx, server, FD_ACCEPT | FD_CLOSE | FD_CONNECT | FD_OOB | FD_READ); - check_events_todo_event(ctx, FD_CLOSE, 0, 200); + check_events_todo(ctx, FD_CLOSE, 0, 200); closesocket(server); } diff --git a/server/sock.c b/server/sock.c index c8cd603149b..92202d317c4 100644 --- a/server/sock.c +++ b/server/sock.c @@ -786,8 +786,7 @@ static int sock_get_poll_events( struct fd *fd ) else if (smask & FD_READ || (sock->state & FD_WINE_LISTENING && mask & FD_ACCEPT)) ev |= POLLIN | POLLPRI; /* We use POLLIN with 0 bytes recv() as FD_CLOSE indication for stream sockets. */ - else if (sock->type == WS_SOCK_STREAM && (sock->state & FD_READ) && (mask & FD_CLOSE) && - !(sock->reported_events & FD_READ)) + else if (sock->type == WS_SOCK_STREAM && (mask & FD_CLOSE) && !(sock->reported_events & FD_READ)) ev |= POLLIN; if (async_queued( &sock->write_q ))

1 0

Jacek Caban : winegcc: Use msvcrt by default for PE targets.
by Alexandre Julliard May 14, 2021

May 14, 2021

Module: wine Branch: master Commit: 87e1e435069b640c6f3e4355c9cbbe8f3b62a8fc URL: https://source.winehq.org/git/wine.git/?a=commit;h=87e1e435069b640c6f3e4355… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Fri May 14 16:53:40 2021 +0200 winegcc: Use msvcrt by default for PE targets. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- tools/winegcc/winegcc.c | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c index 969daa0f96b..404c7b773ae 100644 --- a/tools/winegcc/winegcc.c +++ b/tools/winegcc/winegcc.c @@ -324,6 +324,19 @@ static char* get_temp_file(const char* prefix, const char* suffix) return tmp; } +static int is_pe_target( const struct options *opts ) +{ + switch(opts->target_platform) + { + case PLATFORM_MINGW: + case PLATFORM_CYGWIN: + case PLATFORM_WINDOWS: + return 1; + default: + return 0; + } +} + enum tool { TOOL_CC, @@ -1103,7 +1116,7 @@ static void build(struct options* opts) int generate_app_loader = 1; const char *crt_lib = NULL, *entry_point = NULL; int fake_module = 0; - int is_pe = (opts->target_platform == PLATFORM_WINDOWS || opts->target_platform == PLATFORM_CYGWIN || opts->target_platform == PLATFORM_MINGW); + int is_pe = is_pe_target( opts ); unsigned int j; /* NOTE: for the files array we'll use the following convention: @@ -2090,6 +2103,8 @@ int main(int argc, char **argv) if (opts.processor == proc_cpp) linking = 0; if (linking == -1) error("Static linking is not supported\n"); + if (!opts.wine_objdir && is_pe_target( &opts )) opts.use_msvcrt = 1; + if (opts.files->size == 0) forward(&opts); else if (linking) build(&opts); else compile(&opts, lang);

1 0

Zebediah Figura : include: Use FILE_ANY_ACCESS for wine-specific socket ioctls.
by Alexandre Julliard May 14, 2021

May 14, 2021

Module: wine Branch: master Commit: b07384c29250e1e01aa71a5de784d7cbafce332c URL: https://source.winehq.org/git/wine.git/?a=commit;h=b07384c29250e1e01aa71a5d… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu May 13 22:54:38 2021 -0500 include: Use FILE_ANY_ACCESS for wine-specific socket ioctls. All native ioctls use FILE_ANY_ACCESS. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/afd.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/include/wine/afd.h b/include/wine/afd.h index 3562962d6a1..a711fba23a5 100644 --- a/include/wine/afd.h +++ b/include/wine/afd.h @@ -24,11 +24,11 @@ #include <winioctl.h> #include "wine/server_protocol.h" -#define IOCTL_AFD_WINE_CREATE CTL_CODE(FILE_DEVICE_NETWORK, 200, METHOD_BUFFERED, FILE_WRITE_ACCESS) -#define IOCTL_AFD_WINE_ACCEPT CTL_CODE(FILE_DEVICE_NETWORK, 201, METHOD_BUFFERED, FILE_WRITE_ACCESS) -#define IOCTL_AFD_WINE_ACCEPT_INTO CTL_CODE(FILE_DEVICE_NETWORK, 202, METHOD_BUFFERED, FILE_WRITE_ACCESS) +#define IOCTL_AFD_WINE_CREATE CTL_CODE(FILE_DEVICE_NETWORK, 200, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define IOCTL_AFD_WINE_ACCEPT CTL_CODE(FILE_DEVICE_NETWORK, 201, METHOD_BUFFERED, FILE_ANY_ACCESS) +#define IOCTL_AFD_WINE_ACCEPT_INTO CTL_CODE(FILE_DEVICE_NETWORK, 202, METHOD_BUFFERED, FILE_ANY_ACCESS) -#define IOCTL_AFD_WINE_ADDRESS_LIST_CHANGE CTL_CODE(FILE_DEVICE_NETWORK, 323, METHOD_BUFFERED, 0) +#define IOCTL_AFD_WINE_ADDRESS_LIST_CHANGE CTL_CODE(FILE_DEVICE_NETWORK, 323, METHOD_BUFFERED, FILE_ANY_ACCESS) struct afd_create_params {

1 0

Zebediah Figura : server: Implement IOCTL_AFD_LISTEN.
by Alexandre Julliard May 14, 2021

May 14, 2021

Module: wine Branch: master Commit: 6ccf61fbc730bfbb64ccb75ddbc226bb19968694 URL: https://source.winehq.org/git/wine.git/?a=commit;h=6ccf61fbc730bfbb64ccb75d… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu May 13 22:54:39 2021 -0500 server: Implement IOCTL_AFD_LISTEN. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- include/wine/afd.h | 9 +++++++++ server/sock.c | 29 ++++++++++++++++++++++++++++- 2 files changed, 37 insertions(+), 1 deletion(-) diff --git a/include/wine/afd.h b/include/wine/afd.h index a711fba23a5..e890020ca88 100644 --- a/include/wine/afd.h +++ b/include/wine/afd.h @@ -24,6 +24,15 @@ #include <winioctl.h> #include "wine/server_protocol.h" +#define IOCTL_AFD_LISTEN CTL_CODE(FILE_DEVICE_BEEP, 0x802, METHOD_NEITHER, FILE_ANY_ACCESS) + +struct afd_listen_params +{ + int unknown1; + int backlog; + int unknown2; +}; + #define IOCTL_AFD_WINE_CREATE CTL_CODE(FILE_DEVICE_NETWORK, 200, METHOD_BUFFERED, FILE_ANY_ACCESS) #define IOCTL_AFD_WINE_ACCEPT CTL_CODE(FILE_DEVICE_NETWORK, 201, METHOD_BUFFERED, FILE_ANY_ACCESS) #define IOCTL_AFD_WINE_ACCEPT_INTO CTL_CODE(FILE_DEVICE_NETWORK, 202, METHOD_BUFFERED, FILE_ANY_ACCESS) diff --git a/server/sock.c b/server/sock.c index dadcc607fbb..945895b51a4 100644 --- a/server/sock.c +++ b/server/sock.c @@ -1354,10 +1354,11 @@ static struct accept_req *alloc_accept_req( struct sock *sock, struct sock *acce static int sock_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ) { struct sock *sock = get_fd_user( fd ); + int unix_fd; assert( sock->obj.ops == &sock_ops ); - if (code != IOCTL_AFD_WINE_CREATE && get_unix_fd( fd ) < 0) return 0; + if (code != IOCTL_AFD_WINE_CREATE && (unix_fd = get_unix_fd( fd )) < 0) return 0; switch(code) { @@ -1459,6 +1460,32 @@ static int sock_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ) return 1; } + case IOCTL_AFD_LISTEN: + { + const struct afd_listen_params *params = get_req_data(); + + if (get_req_data_size() < sizeof(*params)) + { + set_error( STATUS_INVALID_PARAMETER ); + return 0; + } + + if (listen( unix_fd, params->backlog ) < 0) + { + set_error( sock_get_ntstatus( errno ) ); + return 0; + } + + sock->pending_events &= ~FD_ACCEPT; + sock->reported_events &= ~FD_ACCEPT; + sock->state |= FD_WINE_LISTENING; + sock->state &= ~(FD_CONNECT | FD_WINE_CONNECTED); + + /* we may already be selecting for FD_ACCEPT */ + sock_reselect( sock ); + return 0; + } + case IOCTL_AFD_WINE_ADDRESS_LIST_CHANGE: if ((sock->state & FD_WINE_NONBLOCKING) && async_is_blocking( async )) {

1 0

Zebediah Figura : wined3d: Pass a wined3d_device_context to wined3d_cs_emit_set_transform().
by Alexandre Julliard May 14, 2021

May 14, 2021

Module: wine Branch: master Commit: 6f9e338599462ff75d0fe296022ec4449d76fddc URL: https://source.winehq.org/git/wine.git/?a=commit;h=6f9e338599462ff75d0fe296… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu May 13 10:47:48 2021 -0500 wined3d: Pass a wined3d_device_context to wined3d_cs_emit_set_transform(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 8 ++++---- dlls/wined3d/device.c | 4 ++-- dlls/wined3d/wined3d_private.h | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index e94d1a19dc2..6345aa4f634 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -1832,17 +1832,17 @@ static void wined3d_cs_exec_set_transform(struct wined3d_cs *cs, const void *dat device_invalidate_state(cs->c.device, STATE_TRANSFORM(op->state)); } -void wined3d_cs_emit_set_transform(struct wined3d_cs *cs, enum wined3d_transform_state state, - const struct wined3d_matrix *matrix) +void wined3d_device_context_emit_set_transform(struct wined3d_device_context *context, + enum wined3d_transform_state state, const struct wined3d_matrix *matrix) { struct wined3d_cs_set_transform *op; - op = wined3d_device_context_require_space(&cs->c, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); + op = wined3d_device_context_require_space(context, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); op->opcode = WINED3D_CS_OP_SET_TRANSFORM; op->state = state; op->matrix = *matrix; - wined3d_device_context_submit(&cs->c, WINED3D_CS_QUEUE_DEFAULT); + wined3d_device_context_submit(context, WINED3D_CS_QUEUE_DEFAULT); } static void wined3d_cs_exec_set_clip_plane(struct wined3d_cs *cs, const void *data) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index e62da01171c..e8be09d9e78 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1330,7 +1330,7 @@ static void wined3d_device_set_transform(struct wined3d_device *device, } device->cs->c.state->transforms[state] = *matrix; - wined3d_cs_emit_set_transform(device->cs, state, matrix); + wined3d_device_context_emit_set_transform(&device->cs->c, state, matrix); } static void wined3d_device_get_transform(const struct wined3d_device *device, @@ -1832,7 +1832,7 @@ void CDECL wined3d_device_set_state(struct wined3d_device *device, struct wined3 for (i = 0; i < WINED3D_HIGHEST_TRANSFORM_STATE + 1; ++i) { - wined3d_cs_emit_set_transform(device->cs, i, state->transforms + i); + wined3d_device_context_emit_set_transform(context, i, state->transforms + i); } for (i = 0; i < WINED3D_MAX_CLIP_DISTANCES; ++i) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index c752be692fc..69021675fe7 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4757,8 +4757,6 @@ void wined3d_cs_emit_set_render_state(struct wined3d_cs *cs, enum wined3d_render_state state, DWORD value) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_stream_source_freq(struct wined3d_cs *cs, UINT stream_idx, UINT frequency, UINT flags) DECLSPEC_HIDDEN; -void wined3d_cs_emit_set_transform(struct wined3d_cs *cs, enum wined3d_transform_state state, - const struct wined3d_matrix *matrix) DECLSPEC_HIDDEN; void wined3d_cs_emit_unload_resource(struct wined3d_cs *cs, struct wined3d_resource *resource) DECLSPEC_HIDDEN; void wined3d_cs_init_object(struct wined3d_cs *cs, void (*callback)(void *object), void *object) DECLSPEC_HIDDEN; @@ -4828,6 +4826,8 @@ void wined3d_device_context_emit_set_texture(struct wined3d_device_context *cont struct wined3d_texture *texture) DECLSPEC_HIDDEN; void wined3d_device_context_emit_set_texture_state(struct wined3d_device_context *context, unsigned int stage, enum wined3d_texture_stage_state state, unsigned int value) DECLSPEC_HIDDEN; +void wined3d_device_context_emit_set_transform(struct wined3d_device_context *context, + enum wined3d_transform_state state, const struct wined3d_matrix *matrix) DECLSPEC_HIDDEN; void wined3d_device_context_emit_set_unordered_access_view(struct wined3d_device_context *context, enum wined3d_pipeline pipeline, unsigned int view_idx, struct wined3d_unordered_access_view *view, unsigned int initial_count) DECLSPEC_HIDDEN;

1 0

Zebediah Figura : wined3d: Pass a wined3d_device_context to wined3d_cs_emit_set_light_enable().
by Alexandre Julliard May 14, 2021

May 14, 2021

Module: wine Branch: master Commit: 692a3128b4c8b539fdd85fa488a4d85c62f418ed URL: https://source.winehq.org/git/wine.git/?a=commit;h=692a3128b4c8b539fdd85fa4… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu May 13 10:47:51 2021 -0500 wined3d: Pass a wined3d_device_context to wined3d_cs_emit_set_light_enable(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Henri Verbeet <hverbeet(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/wined3d/cs.c | 6 +++--- dlls/wined3d/device.c | 4 ++-- dlls/wined3d/wined3d_private.h | 3 ++- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index fd8ebbbd40f..7ec3c428fc4 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -2039,16 +2039,16 @@ static void wined3d_cs_exec_set_light_enable(struct wined3d_cs *cs, const void * } } -void wined3d_cs_emit_set_light_enable(struct wined3d_cs *cs, unsigned int idx, BOOL enable) +void wined3d_device_context_emit_set_light_enable(struct wined3d_device_context *context, unsigned int idx, BOOL enable) { struct wined3d_cs_set_light_enable *op; - op = wined3d_device_context_require_space(&cs->c, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); + op = wined3d_device_context_require_space(context, sizeof(*op), WINED3D_CS_QUEUE_DEFAULT); op->opcode = WINED3D_CS_OP_SET_LIGHT_ENABLE; op->idx = idx; op->enable = enable; - wined3d_device_context_submit(&cs->c, WINED3D_CS_QUEUE_DEFAULT); + wined3d_device_context_submit(context, WINED3D_CS_QUEUE_DEFAULT); } static void wined3d_cs_exec_set_feature_level(struct wined3d_cs *cs, const void *data) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index 751df25f559..905357571bf 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1469,7 +1469,7 @@ static void wined3d_device_set_light_enable(struct wined3d_device *device, UINT } wined3d_light_state_enable_light(light_state, &device->adapter->d3d_info, light_info, enable); - wined3d_cs_emit_set_light_enable(device->cs, light_idx, enable); + wined3d_device_context_emit_set_light_enable(&device->cs->c, light_idx, enable); } static HRESULT wined3d_device_set_clip_plane(struct wined3d_device *device, @@ -1850,7 +1850,7 @@ void CDECL wined3d_device_set_state(struct wined3d_device *device, struct wined3 LIST_FOR_EACH_ENTRY(light, &state->light_state.light_map[i], struct wined3d_light_info, entry) { wined3d_device_set_light(device, light->OriginalIndex, &light->OriginalParms); - wined3d_cs_emit_set_light_enable(device->cs, light->OriginalIndex, light->glIndex != -1); + wined3d_device_context_emit_set_light_enable(context, light->OriginalIndex, light->glIndex != -1); } } diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index a338c39ef3c..8e419ed9c0f 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4749,7 +4749,6 @@ void wined3d_cs_emit_reset_state(struct wined3d_cs *cs) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_color_key(struct wined3d_cs *cs, struct wined3d_texture *texture, WORD flags, const struct wined3d_color_key *color_key) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_light(struct wined3d_cs *cs, const struct wined3d_light_info *light) DECLSPEC_HIDDEN; -void wined3d_cs_emit_set_light_enable(struct wined3d_cs *cs, unsigned int idx, BOOL enable) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_render_state(struct wined3d_cs *cs, enum wined3d_render_state state, DWORD value) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_stream_source_freq(struct wined3d_cs *cs, UINT stream_idx, @@ -4800,6 +4799,8 @@ void wined3d_device_context_emit_set_feature_level(struct wined3d_device_context enum wined3d_feature_level level) DECLSPEC_HIDDEN; void wined3d_device_context_emit_set_index_buffer(struct wined3d_device_context *context, struct wined3d_buffer *buffer, enum wined3d_format_id format_id, unsigned int offset) DECLSPEC_HIDDEN; +void wined3d_device_context_emit_set_light_enable(struct wined3d_device_context *context, unsigned int idx, + BOOL enable) DECLSPEC_HIDDEN; void wined3d_device_context_emit_set_material(struct wined3d_device_context *context, const struct wined3d_material *material) DECLSPEC_HIDDEN; void wined3d_device_context_emit_set_predication(struct wined3d_device_context *context,

1 0

Rémi Bernon : user32/tests: Skip inconsistent OemKeyScan tests on non-us keyboard.
by Alexandre Julliard May 14, 2021

May 14, 2021

Module: wine Branch: master Commit: 1cfc34551edc40123a209298cd7e27493af6fa77 URL: https://source.winehq.org/git/wine.git/?a=commit;h=1cfc34551edc40123a209298… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri May 14 16:04:45 2021 +0200 user32/tests: Skip inconsistent OemKeyScan tests on non-us keyboard. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/input.c | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index 3d4f0d03d0d..d10a7f6504d 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -4167,6 +4167,13 @@ static void test_OemKeyScan(void) WCHAR oem, wchr; char oem_char; + BOOL us_kbd = (GetKeyboardLayout(0) == (HKL)(ULONG_PTR)0x04090409); + if (!us_kbd) + { + skip("skipping test with inconsistent results on non-us keyboard\n"); + return; + } + for (oem = 0; oem < 0x200; oem++) { ret = OemKeyScan( oem );

1 0

Rémi Bernon : user32/tests: Initialize the cursor position in test_GetRawInputBuffer.
by Alexandre Julliard May 14, 2021

May 14, 2021

Module: wine Branch: master Commit: 516c7e0dd8189b021c86da234bec2079956909c1 URL: https://source.winehq.org/git/wine.git/?a=commit;h=516c7e0dd8189b021c86da23… Author: Rémi Bernon <rbernon(a)codeweavers.com> Date: Fri May 14 16:04:46 2021 +0200 user32/tests: Initialize the cursor position in test_GetRawInputBuffer. Signed-off-by: Rémi Bernon <rbernon(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/user32/tests/input.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c index d10a7f6504d..1679048794b 100644 --- a/dlls/user32/tests/input.c +++ b/dlls/user32/tests/input.c @@ -2236,10 +2236,15 @@ static void test_GetRawInputBuffer(void) UINT size, count, rawinput_size; HWND hwnd; BOOL ret; + POINT pt; if (is_wow64) rawinput_size = sizeof(RAWINPUT64); else rawinput_size = sizeof(RAWINPUT); + SetCursorPos(300, 300); + GetCursorPos(&pt); + ok(pt.x == 300 && pt.y == 300, "Unexpected cursor position pos %dx%d\n", pt.x, pt.y); + hwnd = CreateWindowA("static", "static", WS_VISIBLE | WS_POPUP, 100, 100, 100, 100, 0, NULL, NULL, NULL); SetWindowLongPtrA(hwnd, GWLP_WNDPROC, (LONG_PTR)rawinputbuffer_wndproc);

1 0

Hugh McMaster : reg/tests: Add missing return code checks.
by Alexandre Julliard May 14, 2021

May 14, 2021

Module: wine Branch: master Commit: 48cd2588be54f7ab659ae3733456c826101f4c27 URL: https://source.winehq.org/git/wine.git/?a=commit;h=48cd2588be54f7ab659ae373… Author: Hugh McMaster <hugh.mcmaster(a)outlook.com> Date: Fri May 14 22:58:00 2021 +1000 reg/tests: Add missing return code checks. Signed-off-by: Hugh McMaster <hugh.mcmaster(a)outlook.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- programs/reg/tests/export.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/programs/reg/tests/export.c b/programs/reg/tests/export.c index 27d70b6a663..d2598dd8d48 100644 --- a/programs/reg/tests/export.c +++ b/programs/reg/tests/export.c @@ -335,6 +335,7 @@ static void test_export(void) "\"Wine2a\"=hex(1):\n" "\"Wine2b\"=hex(3):\n" "\"Wine2c\"=hex(4):\n\n", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); open_key(HKEY_CURRENT_USER, KEY_BASE, 0, &hkey); verify_reg(hkey, "Wine2a", REG_SZ, NULL, 0, 0); verify_reg(hkey, "Wine2b", REG_BINARY, NULL, 0, 0); @@ -351,6 +352,7 @@ static void test_export(void) "\"Wine3a\"=hex(1):56,00,61,00,6c,00,75,00,65,00,00,00\n" "\"Wine3b\"=hex(3):12,34,56,78\n" "\"Wine3c\"=hex(4):40,30,20,10\n\n", &r); + ok(r == REG_EXIT_SUCCESS, "got exit code %d, expected 0\n", r); open_key(HKEY_CURRENT_USER, KEY_BASE, 0, &hkey); verify_reg(hkey, "Wine3a", REG_SZ, "Value", 6, 0); memcpy(hex, "\x12\x34\x56\x78", 4);

1 0

Zebediah Figura : include: Rename Wine-specific socket ioctls.
by Alexandre Julliard May 14, 2021

May 14, 2021

Module: wine Branch: master Commit: 98d1dc31fb492ed13538d45527e50c30315446c8 URL: https://source.winehq.org/git/wine.git/?a=commit;h=98d1dc31fb492ed13538d455… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Thu May 13 22:54:37 2021 -0500 include: Rename Wine-specific socket ioctls. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/ws2_32/socket.c | 8 ++++---- include/wine/afd.h | 8 ++++---- server/sock.c | 10 +++++----- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 0a23b44cc68..6c03a57e325 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -2341,7 +2341,7 @@ SOCKET WINAPI WS_accept( SOCKET s, struct WS_sockaddr *addr, int *len ) if (!(sync_event = CreateEventW( NULL, TRUE, FALSE, NULL ))) return INVALID_SOCKET; status = NtDeviceIoControlFile( SOCKET2HANDLE(s), (HANDLE)((ULONG_PTR)sync_event | 0), NULL, NULL, &io, - IOCTL_AFD_ACCEPT, NULL, 0, &accept_handle, sizeof(accept_handle) ); + IOCTL_AFD_WINE_ACCEPT, NULL, 0, &accept_handle, sizeof(accept_handle) ); if (status == STATUS_PENDING) { if (WaitForSingleObject( sync_event, INFINITE ) == WAIT_FAILED) @@ -2416,7 +2416,7 @@ static BOOL WINAPI WS2_AcceptEx( SOCKET listener, SOCKET acceptor, void *dest, D } status = NtDeviceIoControlFile( SOCKET2HANDLE(listener), overlapped->hEvent, NULL, cvalue, - (IO_STATUS_BLOCK *)overlapped, IOCTL_AFD_ACCEPT_INTO, &params, sizeof(params), + (IO_STATUS_BLOCK *)overlapped, IOCTL_AFD_WINE_ACCEPT_INTO, &params, sizeof(params), dest, recv_len + local_len + remote_len ); if (ret_len) *ret_len = overlapped->InternalHigh; @@ -4507,7 +4507,7 @@ INT WINAPI WSAIoctl(SOCKET s, DWORD code, LPVOID in_buff, DWORD in_size, LPVOID SetLastError(WSAEOPNOTSUPP); return SOCKET_ERROR; case WS_SIO_ADDRESS_LIST_CHANGE: - code = IOCTL_AFD_ADDRESS_LIST_CHANGE; + code = IOCTL_AFD_WINE_ADDRESS_LIST_CHANGE; status = WSAEOPNOTSUPP; break; default: @@ -5921,7 +5921,7 @@ SOCKET WINAPI WSASocketW(int af, int type, int protocol, create_params.protocol = protocol; create_params.flags = flags & ~(WSA_FLAG_NO_HANDLE_INHERIT | WSA_FLAG_OVERLAPPED); if ((status = NtDeviceIoControlFile(handle, NULL, NULL, NULL, &io, - IOCTL_AFD_CREATE, &create_params, sizeof(create_params), NULL, 0))) + IOCTL_AFD_WINE_CREATE, &create_params, sizeof(create_params), NULL, 0))) { WARN("Failed to initialize socket, status %#x.\n", status); err = RtlNtStatusToDosError( status ); diff --git a/include/wine/afd.h b/include/wine/afd.h index 07320e7bab5..3562962d6a1 100644 --- a/include/wine/afd.h +++ b/include/wine/afd.h @@ -24,11 +24,11 @@ #include <winioctl.h> #include "wine/server_protocol.h" -#define IOCTL_AFD_CREATE CTL_CODE(FILE_DEVICE_NETWORK, 200, METHOD_BUFFERED, FILE_WRITE_ACCESS) -#define IOCTL_AFD_ACCEPT CTL_CODE(FILE_DEVICE_NETWORK, 201, METHOD_BUFFERED, FILE_WRITE_ACCESS) -#define IOCTL_AFD_ACCEPT_INTO CTL_CODE(FILE_DEVICE_NETWORK, 202, METHOD_BUFFERED, FILE_WRITE_ACCESS) +#define IOCTL_AFD_WINE_CREATE CTL_CODE(FILE_DEVICE_NETWORK, 200, METHOD_BUFFERED, FILE_WRITE_ACCESS) +#define IOCTL_AFD_WINE_ACCEPT CTL_CODE(FILE_DEVICE_NETWORK, 201, METHOD_BUFFERED, FILE_WRITE_ACCESS) +#define IOCTL_AFD_WINE_ACCEPT_INTO CTL_CODE(FILE_DEVICE_NETWORK, 202, METHOD_BUFFERED, FILE_WRITE_ACCESS) -#define IOCTL_AFD_ADDRESS_LIST_CHANGE CTL_CODE(FILE_DEVICE_NETWORK, 323, METHOD_BUFFERED, 0) +#define IOCTL_AFD_WINE_ADDRESS_LIST_CHANGE CTL_CODE(FILE_DEVICE_NETWORK, 323, METHOD_BUFFERED, 0) struct afd_create_params { diff --git a/server/sock.c b/server/sock.c index 340566cbb0a..dadcc607fbb 100644 --- a/server/sock.c +++ b/server/sock.c @@ -1357,11 +1357,11 @@ static int sock_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ) assert( sock->obj.ops == &sock_ops ); - if (code != IOCTL_AFD_CREATE && get_unix_fd( fd ) < 0) return 0; + if (code != IOCTL_AFD_WINE_CREATE && get_unix_fd( fd ) < 0) return 0; switch(code) { - case IOCTL_AFD_CREATE: + case IOCTL_AFD_WINE_CREATE: { const struct afd_create_params *params = get_req_data(); @@ -1374,7 +1374,7 @@ static int sock_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ) return 0; } - case IOCTL_AFD_ACCEPT: + case IOCTL_AFD_WINE_ACCEPT: { struct sock *acceptsock; obj_handle_t handle; @@ -1409,7 +1409,7 @@ static int sock_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ) return 0; } - case IOCTL_AFD_ACCEPT_INTO: + case IOCTL_AFD_WINE_ACCEPT_INTO: { static const int access = FILE_READ_ATTRIBUTES | FILE_WRITE_ATTRIBUTES | FILE_READ_DATA; const struct afd_accept_into_params *params = get_req_data(); @@ -1459,7 +1459,7 @@ static int sock_ioctl( struct fd *fd, ioctl_code_t code, struct async *async ) return 1; } - case IOCTL_AFD_ADDRESS_LIST_CHANGE: + case IOCTL_AFD_WINE_ADDRESS_LIST_CHANGE: if ((sock->state & FD_WINE_NONBLOCKING) && async_is_blocking( async )) { set_error( STATUS_DEVICE_NOT_READY );

1 0