March 2021 - Wine-Devel - list.winehq.org

[PATCH 7/9] shell32/tests: Use nameless unions.
by Jacek Caban March 24, 2021

March 24, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/shell32/tests/Makefile.in | 1 - dlls/shell32/tests/shellole.c | 12 ++++++------ 2 files changed, 6 insertions(+), 7 deletions(-)

1 0

[PATCH 6/9] shell32: Use nameless unions.
by Jacek Caban March 24, 2021

March 24, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/shell32/Makefile.in | 2 +- dlls/shell32/shellole.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-)

1 0

[PATCH] sapi/tests: Remove SpResourceManager refcount tests.
by Gijs Vermeulen March 24, 2021

March 24, 2021

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50841 Signed-off-by: Gijs Vermeulen <gijsvrm(a)gmail.com> --- dlls/sapi/tests/resource.c | 23 +++++------------------ 1 file changed, 5 insertions(+), 18 deletions(-) diff --git a/dlls/sapi/tests/resource.c b/dlls/sapi/tests/resource.c index cbddaf6323a..0c4bd5bc783 100644 --- a/dlls/sapi/tests/resource.c +++ b/dlls/sapi/tests/resource.c @@ -25,15 +25,6 @@ #include "wine/test.h" -#define EXPECT_REF(obj,ref) _expect_ref((IUnknown*)obj, ref, __LINE__) -static void _expect_ref(IUnknown *obj, ULONG ref, int line) -{ - ULONG rc; - IUnknown_AddRef(obj); - rc = IUnknown_Release(obj); - ok_(__FILE__,line)(rc == ref, "Unexpected refcount %d, expected %d.\n", rc, ref); -} - static void test_interfaces(void) { ISpResourceManager *resource_manager, *resource_manager2; @@ -44,25 +35,21 @@ static void test_interfaces(void) hr = CoCreateInstance(&CLSID_SpResourceManager, NULL, CLSCTX_INPROC_SERVER, &IID_ISpResourceManager, (void **)&resource_manager); ok(hr == S_OK, "Failed to create ISpeechVoice interface: %#x.\n", hr); - EXPECT_REF(resource_manager, 1); + ok(!!resource_manager, "Expected non-NULL resource manager.\n"); hr = CoCreateInstance(&CLSID_SpResourceManager, NULL, CLSCTX_INPROC_SERVER, &IID_ISpResourceManager, (void **)&resource_manager2); ok(hr == S_OK, "Failed to create ISpeechVoice interface: %#x.\n", hr); + ok(!!resource_manager2, "Expected non-NULL resource manager.\n"); todo_wine ok(resource_manager2 == resource_manager, "Expected managers to match.\n"); - todo_wine EXPECT_REF(resource_manager2, 2); - todo_wine EXPECT_REF(resource_manager, 2); - if (resource_manager2 == resource_manager) ISpResourceManager_Release(resource_manager2); - EXPECT_REF(resource_manager, 1); + ISpResourceManager_Release(resource_manager2); hr = CoCreateInstance(&CLSID_SpResourceManager, NULL, CLSCTX_INPROC_SERVER, &IID_IUnknown, (void **)&unk); ok(hr == S_OK, "Failed to create IUnknown interface: %#x.\n", hr); + ok(!!unk, "Expected non-NULL unk.\n"); todo_wine ok(unk == (IUnknown *)resource_manager, "Expected unk to match existing manager.\n"); - todo_wine EXPECT_REF(unk, 2); - todo_wine EXPECT_REF(resource_manager, 2); - if (unk == (IUnknown *)resource_manager) IUnknown_Release(unk); - EXPECT_REF(resource_manager, 1); + IUnknown_Release(unk); hr = CoCreateInstance(&CLSID_SpResourceManager, NULL, CLSCTX_INPROC_SERVER, &IID_IDispatch, (void **)&dispatch); -- 2.31.0

1 0

[PATCH 4/5] mountmgr.sys: Add the ability to query filesystem attributes on a file handle.
by Erich E. Hoover March 24, 2021

March 24, 2021

This patch adds capability to the new IOCTL_MOUNTMGR_QUERY_VOLUME ioctl to be able to return volume information on a file handle. This code represents the "fallback" case when standard volume information is unavailable (for more details see the code removed from dlls/ntdll/unix/file.c in patch 5 in the case where get_mountmgr_fs_info() fails). Best, Erich

3 3

[PATCH 2/5] mountmgr.sys: Simplify query_unix_drive.
by Erich E. Hoover March 24, 2021

March 24, 2021

This patch replaces query_dos_device() with a find_volume_by_letter() routine and query_unix_device() with a find_volume_by_unixdev() routine, which sets up for patch 3 to be able to share this code to find the volumes (by letter and unix device). The patch also consolidates all the actual query code into query_unix_drive. Best, Erich

2 1

[PATCH 1/5] mountmgr.sys: Move query_unix_drive to drive.c.
by Erich E. Hoover March 24, 2021

March 24, 2021

The purpose of this patchset is to further consolidate the volume information in the mountmgr. Currently there are a couple of different paths that can be taken to obtain the volume information, by the end of this set all FileFsAttributeInformation/FileFsVolumeInformation queries run through the same code in the mountmgr. This particular patch just moves query_unix_device to facilitate code reuse in later patches. Best, Erich

2 1

[PATCH vkd3d 1/6] vkd3d-shader: Forbid storage modifiers on struct fields.
by Zebediah Figura March 24, 2021

March 24, 2021

Signed-off-by: Zebediah Figura <zfigura(a)codeweavers.com> --- libs/vkd3d-shader/hlsl.c | 1 - libs/vkd3d-shader/hlsl.h | 1 - libs/vkd3d-shader/hlsl.y | 15 +++++++++++---- 3 files changed, 11 insertions(+), 6 deletions(-) diff --git a/libs/vkd3d-shader/hlsl.c b/libs/vkd3d-shader/hlsl.c index 85859ada..4526348e 100644 --- a/libs/vkd3d-shader/hlsl.c +++ b/libs/vkd3d-shader/hlsl.c @@ -340,7 +340,6 @@ struct hlsl_type *hlsl_type_clone(struct hlsl_ctx *ctx, struct hlsl_type *old, u field->name = vkd3d_strdup(old_field->name); if (old_field->semantic) field->semantic = vkd3d_strdup(old_field->semantic); - field->modifiers = old_field->modifiers; field->reg_offset = reg_size; reg_size += field->type->reg_size; list_add_tail(type->e.elements, &field->entry); diff --git a/libs/vkd3d-shader/hlsl.h b/libs/vkd3d-shader/hlsl.h index 819b8826..523d156d 100644 --- a/libs/vkd3d-shader/hlsl.h +++ b/libs/vkd3d-shader/hlsl.h @@ -134,7 +134,6 @@ struct hlsl_struct_field struct hlsl_type *type; const char *name; const char *semantic; - DWORD modifiers; unsigned int reg_offset; }; diff --git a/libs/vkd3d-shader/hlsl.y b/libs/vkd3d-shader/hlsl.y index 45767de9..4b0ddea4 100644 --- a/libs/vkd3d-shader/hlsl.y +++ b/libs/vkd3d-shader/hlsl.y @@ -721,8 +721,7 @@ static struct hlsl_type *apply_type_modifiers(struct hlsl_ctx *ctx, struct hlsl_ return new_type; } -static struct list *gen_struct_fields(struct hlsl_ctx *ctx, struct hlsl_type *type, - DWORD modifiers, struct list *fields) +static struct list *gen_struct_fields(struct hlsl_ctx *ctx, struct hlsl_type *type, struct list *fields) { struct parse_variable_def *v, *v_next; struct hlsl_struct_field *field; @@ -748,7 +747,6 @@ static struct list *gen_struct_fields(struct hlsl_ctx *ctx, struct hlsl_type *ty field->type = hlsl_new_array_type(ctx, field->type, v->arrays.sizes[i]); field->loc = v->loc; field->name = v->name; - field->modifiers = modifiers; field->semantic = v->semantic; if (v->initializer.args_count) { @@ -1937,7 +1935,16 @@ field: if (!(type = apply_type_modifiers(ctx, $2, &modifiers, @1))) YYABORT; - $$ = gen_struct_fields(ctx, type, modifiers, $3); + if (modifiers) + { + struct vkd3d_string_buffer *string; + + if ((string = hlsl_modifiers_to_string(&ctx->string_buffers, modifiers))) + hlsl_error(ctx, @1, VKD3D_SHADER_ERROR_HLSL_INVALID_MODIFIER, + "Modifiers '%s' are not allowed on struct fields.", string->buffer); + vkd3d_string_buffer_release(&ctx->string_buffers, string); + } + $$ = gen_struct_fields(ctx, type, $3); } func_declaration: -- 2.31.0

5 19

[PATCH] ws2_32: Copy send buffer data in WS2_ConnectEx().
by Paul Gofman March 24, 2021

March 24, 2021

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50738 Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/ws2_32/socket.c | 11 +++++++++-- dlls/ws2_32/tests/sock.c | 1 + 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 28b14e71c9c..366aa969c36 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -3447,14 +3447,18 @@ static BOOL WINAPI WS2_ConnectEx(SOCKET s, const struct WS_sockaddr* name, int n else if (ret == WSAEINPROGRESS) { struct ws2_async *wsa; + DWORD size; + ULONG_PTR cvalue = (((ULONG_PTR)ov->hEvent & 1) == 0) ? (ULONG_PTR)ov : 0; _enable_event(SOCKET2HANDLE(s), FD_CONNECT|FD_READ|FD_WRITE, FD_CONNECT, FD_WINE_CONNECTED|FD_WINE_LISTENING); + size = offsetof( struct ws2_async, iovec[1] ) + sendBufLen; + /* Indirectly call WSASend */ - if (!(wsa = (struct ws2_async *)alloc_async_io( offsetof( struct ws2_async, iovec[1] ), WS2_async_send ))) + if (!(wsa = (struct ws2_async *)alloc_async_io( size, WS2_async_send ))) { SetLastError(WSAEFAULT); } @@ -3473,9 +3477,12 @@ static BOOL WINAPI WS2_ConnectEx(SOCKET s, const struct WS_sockaddr* name, int n wsa->n_iovecs = sendBuf ? 1 : 0; wsa->first_iovec = 0; wsa->completion_func = NULL; - wsa->iovec[0].iov_base = sendBuf; + wsa->iovec[0].iov_base = sendBuf ? (BYTE *)wsa + offsetof( struct ws2_async, iovec[1] ) : NULL; wsa->iovec[0].iov_len = sendBufLen; + if (sendBuf) + memcpy( wsa->iovec[0].iov_base, sendBuf, sendBufLen ); + status = register_async( ASYNC_TYPE_WRITE, wsa->hSocket, &wsa->io, ov->hEvent, NULL, (void *)cvalue, iosb ); if (status != STATUS_PENDING) HeapFree(GetProcessHeap(), 0, wsa); diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index cab25baf1d1..cedbf423d97 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -7296,6 +7296,7 @@ static void test_ConnectEx(void) buffer[1] = '2'; buffer[2] = '3'; bret = pConnectEx(connector, (struct sockaddr*)&address, addrlen, buffer, 3, &bytesReturned, &overlapped); + memset(buffer, 0, 3); ok(bret == FALSE && WSAGetLastError() == ERROR_IO_PENDING, "ConnectEx failed: " "returned %d + errno %d\n", bret, WSAGetLastError()); dwret = WaitForSingleObject(overlapped.hEvent, 15000); -- 2.30.2

3 3

[PATCH v2] ws2_32: Copy send buffer data for async send in WS2_ConnectEx().
by Paul Gofman March 24, 2021

March 24, 2021

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=50738 Signed-off-by: Paul Gofman <pgofman(a)codeweavers.com> --- dlls/ws2_32/socket.c | 11 +++++++++-- dlls/ws2_32/tests/sock.c | 1 + 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index 28b14e71c9c..6436eb5ef99 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -3447,14 +3447,18 @@ static BOOL WINAPI WS2_ConnectEx(SOCKET s, const struct WS_sockaddr* name, int n else if (ret == WSAEINPROGRESS) { struct ws2_async *wsa; + DWORD size; + ULONG_PTR cvalue = (((ULONG_PTR)ov->hEvent & 1) == 0) ? (ULONG_PTR)ov : 0; _enable_event(SOCKET2HANDLE(s), FD_CONNECT|FD_READ|FD_WRITE, FD_CONNECT, FD_WINE_CONNECTED|FD_WINE_LISTENING); + size = offsetof( struct ws2_async, iovec[1] ) + sendBufLen; + /* Indirectly call WSASend */ - if (!(wsa = (struct ws2_async *)alloc_async_io( offsetof( struct ws2_async, iovec[1] ), WS2_async_send ))) + if (!(wsa = (struct ws2_async *)alloc_async_io( size, WS2_async_send ))) { SetLastError(WSAEFAULT); } @@ -3473,9 +3477,12 @@ static BOOL WINAPI WS2_ConnectEx(SOCKET s, const struct WS_sockaddr* name, int n wsa->n_iovecs = sendBuf ? 1 : 0; wsa->first_iovec = 0; wsa->completion_func = NULL; - wsa->iovec[0].iov_base = sendBuf; + wsa->iovec[0].iov_base = sendBuf ? &wsa->iovec[1] : NULL; wsa->iovec[0].iov_len = sendBufLen; + if (sendBuf) + memcpy( wsa->iovec[0].iov_base, sendBuf, sendBufLen ); + status = register_async( ASYNC_TYPE_WRITE, wsa->hSocket, &wsa->io, ov->hEvent, NULL, (void *)cvalue, iosb ); if (status != STATUS_PENDING) HeapFree(GetProcessHeap(), 0, wsa); diff --git a/dlls/ws2_32/tests/sock.c b/dlls/ws2_32/tests/sock.c index cab25baf1d1..cedbf423d97 100644 --- a/dlls/ws2_32/tests/sock.c +++ b/dlls/ws2_32/tests/sock.c @@ -7296,6 +7296,7 @@ static void test_ConnectEx(void) buffer[1] = '2'; buffer[2] = '3'; bret = pConnectEx(connector, (struct sockaddr*)&address, addrlen, buffer, 3, &bytesReturned, &overlapped); + memset(buffer, 0, 3); ok(bret == FALSE && WSAGetLastError() == ERROR_IO_PENDING, "ConnectEx failed: " "returned %d + errno %d\n", bret, WSAGetLastError()); dwret = WaitForSingleObject(overlapped.hEvent, 15000); -- 2.30.2

1 0

[PATCH] jscript: Fallback to begin of input in script_parse if error location was not recorded.
by Jacek Caban March 24, 2021

March 24, 2021

Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> --- dlls/jscript/parser.y | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-)

1 0