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

Zebediah Figura : wined3d: Pass a wined3d_device_context to wined3d_cs_push_constants().
by Alexandre Julliard 12 May '21

12 May '21

Module: wine Branch: master Commit: f3b11720ea2b8afdf7c3b899cf7986a08838c34d URL: https://source.winehq.org/git/wine.git/?a=commit;h=f3b11720ea2b8afdf7c3b899… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed May 12 11:09:59 2021 -0500 wined3d: Pass a wined3d_device_context to wined3d_cs_push_constants(). 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/device.c | 24 ++++++++++++------------ dlls/wined3d/wined3d_private.h | 6 +++--- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index ff1d03de0f8..fc07c78bb43 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1799,18 +1799,18 @@ void CDECL wined3d_device_set_state(struct wined3d_device *device, struct wined3 } } - wined3d_cs_push_constants(device->cs, WINED3D_PUSH_CONSTANTS_VS_F, + wined3d_device_context_push_constants(context, WINED3D_PUSH_CONSTANTS_VS_F, 0, WINED3D_MAX_VS_CONSTS_F, state->vs_consts_f); - wined3d_cs_push_constants(device->cs, WINED3D_PUSH_CONSTANTS_VS_I, + wined3d_device_context_push_constants(context, WINED3D_PUSH_CONSTANTS_VS_I, 0, WINED3D_MAX_CONSTS_I, state->vs_consts_i); - wined3d_cs_push_constants(device->cs, WINED3D_PUSH_CONSTANTS_VS_B, + wined3d_device_context_push_constants(context, WINED3D_PUSH_CONSTANTS_VS_B, 0, WINED3D_MAX_CONSTS_B, state->vs_consts_b); - wined3d_cs_push_constants(device->cs, WINED3D_PUSH_CONSTANTS_PS_F, + wined3d_device_context_push_constants(context, WINED3D_PUSH_CONSTANTS_PS_F, 0, WINED3D_MAX_PS_CONSTS_F, state->ps_consts_f); - wined3d_cs_push_constants(device->cs, WINED3D_PUSH_CONSTANTS_PS_I, + wined3d_device_context_push_constants(context, WINED3D_PUSH_CONSTANTS_PS_I, 0, WINED3D_MAX_CONSTS_I, state->ps_consts_i); - wined3d_cs_push_constants(device->cs, WINED3D_PUSH_CONSTANTS_PS_B, + wined3d_device_context_push_constants(context, WINED3D_PUSH_CONSTANTS_PS_B, 0, WINED3D_MAX_CONSTS_B, state->ps_consts_b); for (i = 0; i < WINED3D_MAX_COMBINED_SAMPLERS; ++i) @@ -2573,7 +2573,7 @@ static void wined3d_device_set_vs_consts_b(struct wined3d_device *device, TRACE("Set BOOL constant %u to %#x.\n", start_idx + i, constants[i]); } - wined3d_cs_push_constants(device->cs, WINED3D_PUSH_CONSTANTS_VS_B, start_idx, count, constants); + wined3d_device_context_push_constants(&device->cs->c, WINED3D_PUSH_CONSTANTS_VS_B, start_idx, count, constants); } static void wined3d_device_set_vs_consts_i(struct wined3d_device *device, @@ -2591,7 +2591,7 @@ static void wined3d_device_set_vs_consts_i(struct wined3d_device *device, TRACE("Set ivec4 constant %u to %s.\n", start_idx + i, debug_ivec4(&constants[i])); } - wined3d_cs_push_constants(device->cs, WINED3D_PUSH_CONSTANTS_VS_I, start_idx, count, constants); + wined3d_device_context_push_constants(&device->cs->c, WINED3D_PUSH_CONSTANTS_VS_I, start_idx, count, constants); } static void wined3d_device_set_vs_consts_f(struct wined3d_device *device, @@ -2609,7 +2609,7 @@ static void wined3d_device_set_vs_consts_f(struct wined3d_device *device, TRACE("Set vec4 constant %u to %s.\n", start_idx + i, debug_vec4(&constants[i])); } - wined3d_cs_push_constants(device->cs, WINED3D_PUSH_CONSTANTS_VS_F, start_idx, count, constants); + wined3d_device_context_push_constants(&device->cs->c, WINED3D_PUSH_CONSTANTS_VS_F, start_idx, count, constants); } void CDECL wined3d_device_set_pixel_shader(struct wined3d_device *device, struct wined3d_shader *shader) @@ -2671,7 +2671,7 @@ static void wined3d_device_set_ps_consts_b(struct wined3d_device *device, TRACE("Set BOOL constant %u to %#x.\n", start_idx + i, constants[i]); } - wined3d_cs_push_constants(device->cs, WINED3D_PUSH_CONSTANTS_PS_B, start_idx, count, constants); + wined3d_device_context_push_constants(&device->cs->c, WINED3D_PUSH_CONSTANTS_PS_B, start_idx, count, constants); } static void wined3d_device_set_ps_consts_i(struct wined3d_device *device, @@ -2689,7 +2689,7 @@ static void wined3d_device_set_ps_consts_i(struct wined3d_device *device, TRACE("Set ivec4 constant %u to %s.\n", start_idx + i, debug_ivec4(&constants[i])); } - wined3d_cs_push_constants(device->cs, WINED3D_PUSH_CONSTANTS_PS_I, start_idx, count, constants); + wined3d_device_context_push_constants(&device->cs->c, WINED3D_PUSH_CONSTANTS_PS_I, start_idx, count, constants); } static void wined3d_device_set_ps_consts_f(struct wined3d_device *device, @@ -2707,7 +2707,7 @@ static void wined3d_device_set_ps_consts_f(struct wined3d_device *device, TRACE("Set vec4 constant %u to %s.\n", start_idx + i, debug_vec4(&constants[i])); } - wined3d_cs_push_constants(device->cs, WINED3D_PUSH_CONSTANTS_PS_F, start_idx, count, constants); + wined3d_device_context_push_constants(&device->cs->c, WINED3D_PUSH_CONSTANTS_PS_F, start_idx, count, constants); } void CDECL wined3d_device_set_hull_shader(struct wined3d_device *device, struct wined3d_shader *shader) diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 3babb23f75a..d68262b8d31 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4773,10 +4773,10 @@ static inline void wined3d_cs_finish(struct wined3d_cs *cs, enum wined3d_cs_queu cs->c.ops->finish(&cs->c, queue_id); } -static inline void wined3d_cs_push_constants(struct wined3d_cs *cs, enum wined3d_push_constants p, - unsigned int start_idx, unsigned int count, const void *constants) +static inline void wined3d_device_context_push_constants(struct wined3d_device_context *context, + enum wined3d_push_constants p, unsigned int start_idx, unsigned int count, const void *constants) { - cs->c.ops->push_constants(&cs->c, p, start_idx, count, constants); + context->ops->push_constants(context, p, start_idx, count, constants); } void wined3d_device_context_emit_blt_sub_resource(struct wined3d_device_context *context,

1 0

Zebediah Figura : wined3d: Pass a wined3d_device_context to wined3d_cs_emit_set_texture().
by Alexandre Julliard 12 May '21

12 May '21

Module: wine Branch: master Commit: 8853b1007ef74eddc0f14543a823b7fe427043b3 URL: https://source.winehq.org/git/wine.git/?a=commit;h=8853b1007ef74eddc0f14543… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed May 12 11:10:00 2021 -0500 wined3d: Pass a wined3d_device_context to wined3d_cs_emit_set_texture(). 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 | 7 ++++--- dlls/wined3d/device.c | 4 ++-- dlls/wined3d/wined3d_private.h | 3 ++- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/dlls/wined3d/cs.c b/dlls/wined3d/cs.c index 36bf39cf789..4dc4d7ae08f 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -1551,16 +1551,17 @@ static void wined3d_cs_exec_set_texture(struct wined3d_cs *cs, const void *data) device_invalidate_state(cs->c.device, STATE_COLOR_KEY); } -void wined3d_cs_emit_set_texture(struct wined3d_cs *cs, UINT stage, struct wined3d_texture *texture) +void wined3d_device_context_emit_set_texture(struct wined3d_device_context *context, unsigned int stage, + struct wined3d_texture *texture) { struct wined3d_cs_set_texture *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_TEXTURE; op->stage = stage; op->texture = texture; - 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_shader_resource_view(struct wined3d_cs *cs, const void *data) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index fc07c78bb43..e5e55150093 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1815,7 +1815,7 @@ void CDECL wined3d_device_set_state(struct wined3d_device *device, struct wined3 for (i = 0; i < WINED3D_MAX_COMBINED_SAMPLERS; ++i) { - wined3d_cs_emit_set_texture(device->cs, i, state->textures[i]); + wined3d_device_context_emit_set_texture(context, i, state->textures[i]); for (j = 0; j < WINED3D_HIGHEST_SAMPLER_STATE + 1; ++j) { wined3d_cs_emit_set_sampler_state(device->cs, i, j, state->sampler_states[i][j]); @@ -3960,7 +3960,7 @@ static void wined3d_device_set_texture(struct wined3d_device *device, if (texture) wined3d_texture_incref(texture); - wined3d_cs_emit_set_texture(device->cs, stage, texture); + wined3d_device_context_emit_set_texture(&device->cs->c, stage, texture); if (prev) wined3d_texture_decref(prev); diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index d68262b8d31..79f9bd9899a 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4759,7 +4759,6 @@ void wined3d_cs_emit_set_sampler_state(struct wined3d_cs *cs, UINT sampler_idx, enum wined3d_sampler_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_texture(struct wined3d_cs *cs, UINT stage, struct wined3d_texture *texture) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_texture_state(struct wined3d_cs *cs, UINT stage, enum wined3d_texture_stage_state state, DWORD value) DECLSPEC_HIDDEN; void wined3d_cs_emit_set_transform(struct wined3d_cs *cs, enum wined3d_transform_state state, @@ -4827,6 +4826,8 @@ void wined3d_device_context_emit_set_stream_output(struct wined3d_device_context struct wined3d_buffer *buffer, unsigned int offset) DECLSPEC_HIDDEN; void wined3d_device_context_emit_set_stream_source(struct wined3d_device_context *context, unsigned int stream_idx, struct wined3d_buffer *buffer, unsigned int offset, unsigned int stride) DECLSPEC_HIDDEN; +void wined3d_device_context_emit_set_texture(struct wined3d_device_context *context, unsigned int stage, + struct wined3d_texture *texture) 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_texture_state().
by Alexandre Julliard 12 May '21

12 May '21

Module: wine Branch: master Commit: 026a082daf59d8bc6490b86925c6f9d7705da1a5 URL: https://source.winehq.org/git/wine.git/?a=commit;h=026a082daf59d8bc6490b869… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Wed May 12 11:10:01 2021 -0500 wined3d: Pass a wined3d_device_context to wined3d_cs_emit_set_texture_state(). 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 4dc4d7ae08f..a39ed1dbaf4 100644 --- a/dlls/wined3d/cs.c +++ b/dlls/wined3d/cs.c @@ -1787,18 +1787,18 @@ static void wined3d_cs_exec_set_texture_state(struct wined3d_cs *cs, const void device_invalidate_state(cs->c.device, STATE_TEXTURESTAGE(op->stage, op->state)); } -void wined3d_cs_emit_set_texture_state(struct wined3d_cs *cs, UINT stage, - enum wined3d_texture_stage_state state, DWORD value) +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) { struct wined3d_cs_set_texture_state *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_TEXTURE_STATE; op->stage = stage; op->state = state; op->value = value; - 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_sampler_state(struct wined3d_cs *cs, const void *data) diff --git a/dlls/wined3d/device.c b/dlls/wined3d/device.c index e5e55150093..128dd330f89 100644 --- a/dlls/wined3d/device.c +++ b/dlls/wined3d/device.c @@ -1826,7 +1826,7 @@ void CDECL wined3d_device_set_state(struct wined3d_device *device, struct wined3 { for (j = 0; j < WINED3D_HIGHEST_TEXTURE_STATE + 1; ++j) { - wined3d_cs_emit_set_texture_state(device->cs, i, j, state->texture_states[i][j]); + wined3d_device_context_emit_set_texture_state(context, i, j, state->texture_states[i][j]); } } @@ -3928,7 +3928,7 @@ static void wined3d_device_set_texture_stage_state(struct wined3d_device *device device->cs->c.state->texture_states[stage][state] = value; - wined3d_cs_emit_set_texture_state(device->cs, stage, state, value); + wined3d_device_context_emit_set_texture_state(&device->cs->c, stage, state, value); } static void wined3d_device_set_texture(struct wined3d_device *device, diff --git a/dlls/wined3d/wined3d_private.h b/dlls/wined3d/wined3d_private.h index 79f9bd9899a..4740bb8799d 100644 --- a/dlls/wined3d/wined3d_private.h +++ b/dlls/wined3d/wined3d_private.h @@ -4759,8 +4759,6 @@ void wined3d_cs_emit_set_sampler_state(struct wined3d_cs *cs, UINT sampler_idx, enum wined3d_sampler_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_texture_state(struct wined3d_cs *cs, UINT stage, - enum wined3d_texture_stage_state state, DWORD value) 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; @@ -4828,6 +4826,8 @@ void wined3d_device_context_emit_set_stream_source(struct wined3d_device_context struct wined3d_buffer *buffer, unsigned int offset, unsigned int stride) DECLSPEC_HIDDEN; void wined3d_device_context_emit_set_texture(struct wined3d_device_context *context, unsigned int stage, 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_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

Hugh McMaster : reg: Update the STRING_VALUEALL_FAILED resource string.
by Alexandre Julliard 12 May '21

12 May '21

1 0

Zebediah Figura : sechost: Allow hexadecimal and string rights flags to be interleaved.
by Alexandre Julliard 12 May '21

12 May '21

Module: wine Branch: master Commit: bb3d74c2e1e65b77686d7fab7762de3d9c635e43 URL: https://source.winehq.org/git/wine.git/?a=commit;h=bb3d74c2e1e65b77686d7fab… Author: Zebediah Figura <zfigura(a)codeweavers.com> Date: Tue May 11 16:51:37 2021 -0500 sechost: Allow hexadecimal and string rights flags to be interleaved. Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/advapi32/tests/security.c | 4 ++++ dlls/sechost/security.c | 36 ++++++++++++------------------------ 2 files changed, 16 insertions(+), 24 deletions(-) diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c index 299a340dcf3..b3361795761 100644 --- a/dlls/advapi32/tests/security.c +++ b/dlls/advapi32/tests/security.c @@ -4212,6 +4212,10 @@ static void test_ConvertStringSecurityDescriptor(void) { "D:(A;;KAKRKWKX;;;WD)", SDDL_REVISION_1, TRUE }, { "D:(A;;0xFFFFFFFF;;;WD)", SDDL_REVISION_1, TRUE }, { "S:(AU;;0xFFFFFFFF;;;WD)", SDDL_REVISION_1, TRUE }, + { "S:(AU;;0xDeAdBeEf;;;WD)", SDDL_REVISION_1, TRUE }, + { "S:(AU;;GR0xFFFFFFFF;;;WD)", SDDL_REVISION_1, TRUE }, + { "S:(AU;;0xFFFFFFFFGR;;;WD)", SDDL_REVISION_1, TRUE }, + { "S:(AU;;0xFFFFFGR;;;WD)", SDDL_REVISION_1, TRUE }, /* test ACE string access right error case */ { "D:(A;;ROB;;;WD)", SDDL_REVISION_1, FALSE, ERROR_INVALID_ACL }, /* test behaviour with empty strings */ diff --git a/dlls/sechost/security.c b/dlls/sechost/security.c index 47ffba9ed52..b6731b1fe1c 100644 --- a/dlls/sechost/security.c +++ b/dlls/sechost/security.c @@ -868,14 +868,21 @@ static DWORD parse_ace_flag( const WCHAR *string ) return 0; } -static DWORD parse_ace_right( const WCHAR *string ) +static DWORD parse_ace_right( const WCHAR **string_ptr ) { + const WCHAR *string = *string_ptr; unsigned int i; + if (string[0] == '0' && string[1] == 'x') + return wcstoul( string, (WCHAR **)string_ptr, 16 ); + for (i = 0; i < ARRAY_SIZE(ace_rights); ++i) { if (!wcsncmp( string, ace_rights[i].str, 2 )) + { + *string_ptr += 2; return ace_rights[i].value; + } } return 0; } @@ -908,30 +915,11 @@ static DWORD parse_ace_rights( const WCHAR **string_ptr ) while (*string == ' ') string++; - if (string[0] == '0' && string[1] == 'x') - { - const WCHAR *p = string; - - while (*p && *p != ';') - p++; - - if (p - string <= 10 /* 8 hex digits + "0x" */ ) - { - rights = wcstoul( string, NULL, 16 ); - string = p; - } - else - WARN("Invalid rights string format: %s\n", debugstr_wn(string, p - string)); - } - else + while (*string != ';') { - while (*string != ';') - { - DWORD right = parse_ace_right( string ); - if (!right) return 0; - rights |= right; - string += 2; - } + DWORD right = parse_ace_right( &string ); + if (!right) return 0; + rights |= right; } *string_ptr = string;

1 0

Zebediah Figura : ws2_32/tests: Clean up and expand tests for DisconnectEx().
by Alexandre Julliard 12 May '21

12 May '21

Module: wine Branch: master Commit: ae76d94e55cd0edcaa8cb799d7e39742fdfe00d9 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ae76d94e55cd0edcaa8cb799… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue May 11 21:19:45 2021 -0500 ws2_32/tests: Clean up and expand tests for DisconnectEx(). 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 | 194 +++++++++++++++++++++++++++++++---------------- 1 file changed, 130 insertions(+), 64 deletions(-) Diff: https://source.winehq.org/git/wine.git/?a=commitdiff;h=ae76d94e55cd0edcaa8c…

1 0

Zebediah Figura : ws2_32/tests: Add some tests for shutdown with completion ports.
by Alexandre Julliard 12 May '21

12 May '21

Module: wine Branch: master Commit: 9fd8a298dd1e5c199ab898b7188b29032ec02734 URL: https://source.winehq.org/git/wine.git/?a=commit;h=9fd8a298dd1e5c199ab898b7… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue May 11 21:19:46 2021 -0500 ws2_32/tests: Add some tests for shutdown with completion ports. 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 | 188 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 188 insertions(+) diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index 5da92361bbd..ec78e62969e 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -8469,6 +8469,193 @@ static void test_connect_completion_port(void) CloseHandle(port); } +static void test_shutdown_completion_port(void) +{ + OVERLAPPED overlapped = {0}, *overlapped_ptr; + GUID disconnectex_guid = WSAID_DISCONNECTEX; + struct sockaddr_in addr, destaddr; + LPFN_DISCONNECTEX pDisconnectEx; + SOCKET listener, server, client; + int ret, addrlen; + ULONG_PTR key; + HANDLE port; + DWORD size; + + overlapped.hEvent = CreateEventA(NULL, FALSE, FALSE, NULL); + + listener = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); + ok(listener != -1, "failed to create socket, error %u\n", WSAGetLastError()); + + memset(&addr, 0, sizeof(addr)); + addr.sin_family = AF_INET; + addr.sin_addr.s_addr = inet_addr("127.0.0.1"); + ret = bind(listener, (struct sockaddr *)&addr, sizeof(addr)); + ok(!ret, "failed to bind, error %u\n", WSAGetLastError()); + addrlen = sizeof(destaddr); + ret = getsockname(listener, (struct sockaddr *)&destaddr, &addrlen); + ok(!ret, "failed to get address, error %u\n", WSAGetLastError()); + + ret = listen(listener, 1); + ok(!ret, "failed to listen, error %u\n", WSAGetLastError()); + + client = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); + ok(client != -1, "failed to create socket, error %u\n", WSAGetLastError()); + + ret = WSAIoctl(client, SIO_GET_EXTENSION_FUNCTION_POINTER, &disconnectex_guid, sizeof(disconnectex_guid), + &pDisconnectEx, sizeof(pDisconnectEx), &size, NULL, NULL); + ok(!ret, "Failed to get ConnectEx, error %u\n", WSAGetLastError()); + + /* shutdown() does not queue completion. */ + + port = CreateIoCompletionPort((HANDLE)client, NULL, 0, 0); + ok(!!port, "failed to create port, error %u\n", GetLastError()); + ret = connect(client, (struct sockaddr *)&destaddr, sizeof(destaddr)); + ok(!ret, "failed to connect, error %u\n", WSAGetLastError()); + server = accept(listener, NULL, NULL); + ok(server != -1, "failed to accept, error %u\n", WSAGetLastError()); + + ret = shutdown(client, SD_BOTH); + ok(!ret, "failed to shutdown, error %u\n", WSAGetLastError()); + + ret = GetQueuedCompletionStatus(port, &size, &key, &overlapped_ptr, 0); + ok(!ret, "expected failure\n"); + ok(GetLastError() == WAIT_TIMEOUT, "got error %u\n", GetLastError()); + + closesocket(server); + closesocket(client); + CloseHandle(port); + + /* WSASendDisconnect() and WSARecvDisconnect() do not queue completion. */ + + client = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); + ok(client != -1, "failed to create socket, error %u\n", WSAGetLastError()); + port = CreateIoCompletionPort((HANDLE)client, NULL, 0, 0); + ok(!!port, "failed to create port, error %u\n", GetLastError()); + ret = connect(client, (struct sockaddr *)&destaddr, sizeof(destaddr)); + ok(!ret, "failed to connect, error %u\n", WSAGetLastError()); + server = accept(listener, NULL, NULL); + ok(server != -1, "failed to accept, error %u\n", WSAGetLastError()); + + ret = WSASendDisconnect(client, NULL); + ok(!ret, "failed to shutdown, error %u\n", WSAGetLastError()); + + ret = WSARecvDisconnect(client, NULL); + ok(!ret, "failed to shutdown, error %u\n", WSAGetLastError()); + + ret = GetQueuedCompletionStatus(port, &size, &key, &overlapped_ptr, 0); + ok(!ret, "expected failure\n"); + ok(GetLastError() == WAIT_TIMEOUT, "got error %u\n", GetLastError()); + + closesocket(server); + closesocket(client); + CloseHandle(port); + + /* DisconnectEx() queues completion. */ + + client = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); + ok(client != -1, "failed to create socket, error %u\n", WSAGetLastError()); + port = CreateIoCompletionPort((HANDLE)client, NULL, 0, 0); + ok(!!port, "failed to create port, error %u\n", GetLastError()); + ret = SetFileCompletionNotificationModes((HANDLE)client, FILE_SKIP_COMPLETION_PORT_ON_SUCCESS); + ok(ret, "got error %u\n", GetLastError()); + ret = connect(client, (struct sockaddr *)&destaddr, sizeof(destaddr)); + ok(!ret, "failed to connect, error %u\n", WSAGetLastError()); + server = accept(listener, NULL, NULL); + ok(server != -1, "failed to accept, error %u\n", WSAGetLastError()); + + SetLastError(0xdeadbeef); + ret = pDisconnectEx(client, &overlapped, 0, 0); + todo_wine ok(!ret, "expected failure\n"); + todo_wine ok(GetLastError() == ERROR_IO_PENDING, "got error %u\n", GetLastError()); + if (GetLastError() == ERROR_IO_PENDING) + { + ret = WaitForSingleObject(overlapped.hEvent, 1000); + ok(!ret, "wait failed\n"); + + size = 0xdeadbeef; + ret = GetOverlappedResult((HANDLE)client, &overlapped, &size, TRUE); + ok(ret, "got error %u\n", GetLastError()); + ok(!size, "got %u bytes\n", size); + } + + size = 0xdeadbeef; + key = 0xdeadbeef; + overlapped_ptr = NULL; + ret = GetQueuedCompletionStatus(port, &size, &key, &overlapped_ptr, 0); + todo_wine ok(ret, "got error %u\n", GetLastError()); + todo_wine ok(!key, "got key %#Ix\n", key); + todo_wine ok(!size, "got %u bytes\n", size); + todo_wine ok(overlapped_ptr == &overlapped, "got overlapped %p\n", overlapped_ptr); + + closesocket(server); + closesocket(client); + CloseHandle(port); + + /* Test passing a NULL overlapped structure to DisconnectEx(). */ + + client = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); + ok(client != -1, "failed to create socket, error %u\n", WSAGetLastError()); + port = CreateIoCompletionPort((HANDLE)client, NULL, 0, 0); + ok(!!port, "failed to create port, error %u\n", GetLastError()); + ret = connect(client, (struct sockaddr *)&destaddr, sizeof(destaddr)); + ok(!ret, "failed to connect, error %u\n", WSAGetLastError()); + server = accept(listener, NULL, NULL); + ok(server != -1, "failed to accept, error %u\n", WSAGetLastError()); + + SetLastError(0xdeadbeef); + ret = pDisconnectEx(client, NULL, 0, 0); + ok(ret, "expected success\n"); + ok(!GetLastError() || GetLastError() == 0xdeadbeef /* < 7 */, "got error %u\n", GetLastError()); + + ret = GetQueuedCompletionStatus(port, &size, &key, &overlapped_ptr, 0); + ok(!ret, "expected failure\n"); + ok(GetLastError() == WAIT_TIMEOUT, "got error %u\n", GetLastError()); + + closesocket(server); + closesocket(client); + CloseHandle(port); + + /* Suppress completion by setting the low bit. */ + + client = socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); + ok(client != -1, "failed to create socket, error %u\n", WSAGetLastError()); + port = CreateIoCompletionPort((HANDLE)client, NULL, 0, 0); + ok(!!port, "failed to create port, error %u\n", GetLastError()); + ret = connect(client, (struct sockaddr *)&destaddr, sizeof(destaddr)); + ok(!ret, "failed to connect, error %u\n", WSAGetLastError()); + server = accept(listener, NULL, NULL); + ok(server != -1, "failed to accept, error %u\n", WSAGetLastError()); + + overlapped.hEvent = (HANDLE)((ULONG_PTR)overlapped.hEvent | 1); + + SetLastError(0xdeadbeef); + ret = pDisconnectEx(client, &overlapped, 0, 0); + todo_wine ok(!ret, "expected failure\n"); + todo_wine ok(GetLastError() == ERROR_IO_PENDING, "got error %u\n", GetLastError()); + if (GetLastError() == ERROR_IO_PENDING) + { + ret = WaitForSingleObject(overlapped.hEvent, 1000); + ok(!ret, "wait failed\n"); + + size = 0xdeadbeef; + ret = GetOverlappedResult((HANDLE)client, &overlapped, &size, TRUE); + ok(ret, "got error %u\n", GetLastError()); + ok(!size, "got %u bytes\n", size); + } + + ret = GetQueuedCompletionStatus(port, &size, &key, &overlapped_ptr, 0); + ok(!ret, "expected failure\n"); + ok(GetLastError() == WAIT_TIMEOUT, "got error %u\n", GetLastError()); + + closesocket(server); + closesocket(client); + CloseHandle(port); + + overlapped.hEvent = (HANDLE)((ULONG_PTR)overlapped.hEvent & ~1); + + CloseHandle(overlapped.hEvent); +} + static void test_address_list_query(void) { SOCKET_ADDRESS_LIST *address_list; @@ -9766,6 +9953,7 @@ START_TEST( sock ) test_completion_port(); test_connect_completion_port(); + test_shutdown_completion_port(); test_address_list_query(); test_bind(); test_connecting_socket();

1 0

Zebediah Figura : server: Add a helper to post socket events.
by Alexandre Julliard 12 May '21

12 May '21

Module: wine Branch: master Commit: ccbc17c9f69a79c59303ac6e2d54261de0239653 URL: https://source.winehq.org/git/wine.git/?a=commit;h=ccbc17c9f69a79c59303ac6e… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue May 11 21:19:47 2021 -0500 server: Add a helper to post socket events. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/sock.c | 42 ++++++++++++++++-------------------------- 1 file changed, 16 insertions(+), 26 deletions(-) diff --git a/server/sock.c b/server/sock.c index 6891b5cbc57..791e4912c89 100644 --- a/server/sock.c +++ b/server/sock.c @@ -612,50 +612,40 @@ static int sock_dispatch_asyncs( struct sock *sock, int event, int error ) return event; } +static void post_socket_event( struct sock *sock, unsigned int event_bit, unsigned int error ) +{ + unsigned int event = (1 << event_bit); + + sock->pmask |= event; + sock->hmask |= event; + sock->errors[event_bit] = error; +} + static void sock_dispatch_events( struct sock *sock, int prevstate, int event, int error ) { if (prevstate & FD_CONNECT) { - sock->pmask |= FD_CONNECT; - sock->hmask |= FD_CONNECT; - sock->errors[FD_CONNECT_BIT] = sock_get_error( error ); + post_socket_event( sock, FD_CONNECT_BIT, sock_get_error( error ) ); goto end; } if (prevstate & FD_WINE_LISTENING) { - sock->pmask |= FD_ACCEPT; - sock->hmask |= FD_ACCEPT; - sock->errors[FD_ACCEPT_BIT] = sock_get_error( error ); + post_socket_event( sock, FD_ACCEPT_BIT, sock_get_error( error ) ); goto end; } if (event & POLLIN) - { - sock->pmask |= FD_READ; - sock->hmask |= FD_READ; - sock->errors[FD_READ_BIT] = 0; - } + post_socket_event( sock, FD_READ_BIT, 0 ); if (event & POLLOUT) - { - sock->pmask |= FD_WRITE; - sock->hmask |= FD_WRITE; - sock->errors[FD_WRITE_BIT] = 0; - } + post_socket_event( sock, FD_WRITE_BIT, 0 ); if (event & POLLPRI) - { - sock->pmask |= FD_OOB; - sock->hmask |= FD_OOB; - sock->errors[FD_OOB_BIT] = 0; - } + post_socket_event( sock, FD_OOB_BIT, 0 ); if (event & (POLLERR|POLLHUP)) - { - sock->pmask |= FD_CLOSE; - sock->hmask |= FD_CLOSE; - sock->errors[FD_CLOSE_BIT] = sock_get_error( error ); - } + post_socket_event( sock, FD_CLOSE_BIT, sock_get_error( error ) ); + end: sock_wake_up( sock ); }

1 0

Zebediah Figura : server: Rename "pmask" to "pending_events".
by Alexandre Julliard 12 May '21

12 May '21

Module: wine Branch: master Commit: 30c02f67ceef2f504dc7d47c9b525da1437bff9b URL: https://source.winehq.org/git/wine.git/?a=commit;h=30c02f67ceef2f504dc7d47c… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue May 11 21:19:48 2021 -0500 server: Rename "pmask" to "pending_events". Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/sock.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/server/sock.c b/server/sock.c index 791e4912c89..8b0b56f4070 100644 --- a/server/sock.c +++ b/server/sock.c @@ -112,8 +112,8 @@ struct sock struct fd *fd; /* socket file descriptor */ unsigned int state; /* status bits */ unsigned int mask; /* event mask */ + unsigned int pending_events; /* pending FD_* events which have not yet been reported to the application */ unsigned int hmask; /* held (blocked) events */ - unsigned int pmask; /* pending events */ unsigned int flags; /* socket flags */ int polling; /* is socket being polled? */ unsigned short proto; /* socket protocol */ @@ -386,7 +386,7 @@ static int sock_reselect( struct sock *sock ) /* wake anybody waiting on the socket event or send the associated message */ static void sock_wake_up( struct sock *sock ) { - unsigned int events = sock->pmask & sock->mask; + unsigned int events = sock->pending_events & sock->mask; int i; if ( !events ) return; @@ -402,13 +402,13 @@ static void sock_wake_up( struct sock *sock ) for (i = 0; i < FD_MAX_EVENTS; i++) { int event = event_bitorder[i]; - if (sock->pmask & (1 << event)) + if (sock->pending_events & (1 << event)) { lparam_t lparam = (1 << event) | (sock->errors[event] << 16); post_message( sock->window, sock->message, sock->wparam, lparam ); } } - sock->pmask = 0; + sock->pending_events = 0; sock_reselect( sock ); } } @@ -616,7 +616,7 @@ static void post_socket_event( struct sock *sock, unsigned int event_bit, unsign { unsigned int event = (1 << event_bit); - sock->pmask |= event; + sock->pending_events |= event; sock->hmask |= event; sock->errors[event_bit] = error; } @@ -745,7 +745,7 @@ static void sock_dump( struct object *obj, int verbose ) assert( obj->ops == &sock_ops ); fprintf( stderr, "Socket fd=%p, state=%x, mask=%x, pending=%x, held=%x\n", sock->fd, sock->state, - sock->mask, sock->pmask, sock->hmask ); + sock->mask, sock->pending_events, sock->hmask ); } static int sock_get_poll_events( struct fd *fd ) @@ -893,7 +893,7 @@ static struct sock *create_socket(void) sock->state = 0; sock->mask = 0; sock->hmask = 0; - sock->pmask = 0; + sock->pending_events = 0; sock->polling = 0; sock->flags = 0; sock->proto = 0; @@ -1143,7 +1143,7 @@ static struct sock *accept_socket( struct sock *sock ) } } clear_error(); - sock->pmask &= ~FD_ACCEPT; + sock->pending_events &= ~FD_ACCEPT; sock->hmask &= ~FD_ACCEPT; sock_reselect( sock ); return acceptsock; @@ -1180,7 +1180,7 @@ static int accept_into_socket( struct sock *sock, struct sock *acceptsock ) acceptsock->state |= FD_WINE_CONNECTED|FD_READ|FD_WRITE; acceptsock->hmask = 0; - acceptsock->pmask = 0; + acceptsock->pending_events = 0; acceptsock->polling = 0; acceptsock->proto = sock->proto; acceptsock->type = sock->type; @@ -1193,7 +1193,7 @@ static int accept_into_socket( struct sock *sock, struct sock *acceptsock ) acceptsock->fd = newfd; clear_error(); - sock->pmask &= ~FD_ACCEPT; + sock->pending_events &= ~FD_ACCEPT; sock->hmask &= ~FD_ACCEPT; sock_reselect( sock ); @@ -1801,7 +1801,7 @@ DECL_HANDLER(get_socket_event) FILE_READ_ATTRIBUTES, &sock_ops ))) return; if (get_unix_fd( sock->fd ) == -1) return; reply->mask = sock->mask; - reply->pmask = sock->pmask; + reply->pmask = sock->pending_events; reply->state = sock->state; set_reply_data( sock->errors, min( get_reply_max_size(), sizeof(sock->errors) )); @@ -1817,7 +1817,7 @@ DECL_HANDLER(get_socket_event) release_object( cevent ); } } - sock->pmask = 0; + sock->pending_events = 0; sock_reselect( sock ); } release_object( &sock->obj ); @@ -1835,7 +1835,7 @@ DECL_HANDLER(enable_socket_event) if (get_unix_fd( sock->fd ) == -1) return; /* for event-based notification, windows erases stale events */ - sock->pmask &= ~req->mask; + sock->pending_events &= ~req->mask; sock->hmask &= ~req->mask; sock->state |= req->sstate;

1 0

Zebediah Figura : server: Rename "hmask" to "reported_events".
by Alexandre Julliard 12 May '21

12 May '21

Module: wine Branch: master Commit: 0214c73d4629f40d176bf1508e79bbdec2c0929b URL: https://source.winehq.org/git/wine.git/?a=commit;h=0214c73d4629f40d176bf150… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Tue May 11 21:19:49 2021 -0500 server: Rename "hmask" to "reported_events". Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- server/sock.c | 37 ++++++++++++++++++++++++------------- 1 file changed, 24 insertions(+), 13 deletions(-) diff --git a/server/sock.c b/server/sock.c index 8b0b56f4070..bd65cfc68c3 100644 --- a/server/sock.c +++ b/server/sock.c @@ -112,8 +112,19 @@ struct sock struct fd *fd; /* socket file descriptor */ unsigned int state; /* status bits */ unsigned int mask; /* event mask */ - unsigned int pending_events; /* pending FD_* events which have not yet been reported to the application */ - unsigned int hmask; /* held (blocked) events */ + /* pending FD_* events which have not yet been reported to the application */ + unsigned int pending_events; + /* FD_* events which have already been reported and should not be selected + * for again until reset by a relevant call. + * + * For example, if FD_READ is set here and not in pending_events, it has + * already been reported and consumed, and we should not report it again, + * even if POLLIN is signaled, until it is reset by e.g recv(). + * + * If an event has been signaled and not consumed yet, it will be set in + * both pending_events and reported_events (as we should only ever report + * any event once until it is reset.) */ + unsigned int reported_events; unsigned int flags; /* socket flags */ int polling; /* is socket being polled? */ unsigned short proto; /* socket protocol */ @@ -617,7 +628,7 @@ static void post_socket_event( struct sock *sock, unsigned int event_bit, unsign unsigned int event = (1 << event_bit); sock->pending_events |= event; - sock->hmask |= event; + sock->reported_events |= event; sock->errors[event_bit] = error; } @@ -743,15 +754,15 @@ static void sock_dump( struct object *obj, int verbose ) { struct sock *sock = (struct sock *)obj; assert( obj->ops == &sock_ops ); - fprintf( stderr, "Socket fd=%p, state=%x, mask=%x, pending=%x, held=%x\n", + fprintf( stderr, "Socket fd=%p, state=%x, mask=%x, pending=%x, reported=%x\n", sock->fd, sock->state, - sock->mask, sock->pending_events, sock->hmask ); + sock->mask, sock->pending_events, sock->reported_events ); } static int sock_get_poll_events( struct fd *fd ) { struct sock *sock = get_fd_user( fd ); - unsigned int mask = sock->mask & ~sock->hmask; + unsigned int mask = sock->mask & ~sock->reported_events; unsigned int smask = sock->state & mask; int ev = 0; @@ -773,7 +784,7 @@ static int sock_get_poll_events( struct fd *fd ) 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->hmask & FD_READ)) + !(sock->reported_events & FD_READ)) ev |= POLLIN; if (async_queued( &sock->write_q )) @@ -892,8 +903,8 @@ static struct sock *create_socket(void) sock->fd = NULL; sock->state = 0; sock->mask = 0; - sock->hmask = 0; sock->pending_events = 0; + sock->reported_events = 0; sock->polling = 0; sock->flags = 0; sock->proto = 0; @@ -1144,7 +1155,7 @@ static struct sock *accept_socket( struct sock *sock ) } clear_error(); sock->pending_events &= ~FD_ACCEPT; - sock->hmask &= ~FD_ACCEPT; + sock->reported_events &= ~FD_ACCEPT; sock_reselect( sock ); return acceptsock; } @@ -1179,8 +1190,8 @@ static int accept_into_socket( struct sock *sock, struct sock *acceptsock ) } acceptsock->state |= FD_WINE_CONNECTED|FD_READ|FD_WRITE; - acceptsock->hmask = 0; acceptsock->pending_events = 0; + acceptsock->reported_events = 0; acceptsock->polling = 0; acceptsock->proto = sock->proto; acceptsock->type = sock->type; @@ -1194,7 +1205,7 @@ static int accept_into_socket( struct sock *sock, struct sock *acceptsock ) clear_error(); sock->pending_events &= ~FD_ACCEPT; - sock->hmask &= ~FD_ACCEPT; + sock->reported_events &= ~FD_ACCEPT; sock_reselect( sock ); return TRUE; @@ -1769,7 +1780,7 @@ DECL_HANDLER(set_socket_event) if (get_unix_fd( sock->fd ) == -1) return; old_event = sock->event; sock->mask = req->mask; - sock->hmask &= ~req->mask; /* re-enable held events */ + sock->reported_events &= ~req->mask; /* re-enable held events */ sock->event = NULL; sock->window = req->window; sock->message = req->msg; @@ -1837,7 +1848,7 @@ DECL_HANDLER(enable_socket_event) /* for event-based notification, windows erases stale events */ sock->pending_events &= ~req->mask; - sock->hmask &= ~req->mask; + sock->reported_events &= ~req->mask; sock->state |= req->sstate; sock->state &= ~req->cstate; if (sock->type != WS_SOCK_STREAM) sock->state &= ~STREAM_FLAG_MASK;

1 0