Wine-devel

Download

wine-devel@list.winehq.org

July 2021

86 participants
642 discussions

[PATCH v5 1/3] server: Use a separate request to retrieve the object name.
by Zebediah Figura 01 Jul '21

01 Jul '21

A deleted key returns STATUS_KEY_DELETED when ObjectNameInformation is requested, but succeeds when ObjectBasicInformation is requested. Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/ntdll/unix/file.c | 2 +- server/handle.c | 11 ++++++++++- server/protocol.def | 7 +++++++ 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/dlls/ntdll/unix/file.c b/dlls/ntdll/unix/file.c index 1a57a112a59..21bcb215385 100644 --- a/dlls/ntdll/unix/file.c +++ b/dlls/ntdll/unix/file.c @@ -6772,7 +6772,7 @@ NTSTATUS WINAPI NtQueryObject( HANDLE handle, OBJECT_INFORMATION_CLASS info_clas /* not a file, treat as a generic object */ - SERVER_START_REQ( get_object_info ) + SERVER_START_REQ( get_object_name ) { req->handle = wine_server_obj_handle( handle ); if (len > sizeof(*p)) wine_server_set_reply( req, p + 1, len - sizeof(*p) ); diff --git a/server/handle.c b/server/handle.c index d86f0960ccf..6efd82f2ff9 100644 --- a/server/handle.c +++ b/server/handle.c @@ -686,13 +686,22 @@ DECL_HANDLER(dup_handle) DECL_HANDLER(get_object_info) { struct object *obj; - WCHAR *name; if (!(obj = get_handle_obj( current->process, req->handle, 0, NULL ))) return; reply->access = get_handle_access( current->process, req->handle ); reply->ref_count = obj->refcount; reply->handle_count = obj->handle_count; + release_object( obj ); +} + +DECL_HANDLER(get_object_name) +{ + struct object *obj; + WCHAR *name; + + if (!(obj = get_handle_obj( current->process, req->handle, 0, NULL ))) return; + if ((name = obj->ops->get_full_name( obj, &reply->total ))) set_reply_data_ptr( name, min( reply->total, get_reply_max_size() )); release_object( obj ); diff --git a/server/protocol.def b/server/protocol.def index 762be1fa7c0..59ed5632503 100644 --- a/server/protocol.def +++ b/server/protocol.def @@ -3299,6 +3299,13 @@ struct handle_info unsigned int access; /* granted access mask */ unsigned int ref_count; /* object ref count */ unsigned int handle_count; /* object handle count */ +(a)END + + +/* Query the full name of an object */ +(a)REQ(get_object_name) + obj_handle_t handle; /* handle to the object */ +(a)REPLY data_size_t total; /* total needed size for name */ VARARG(name,unicode_str); /* object name */ @END -- 2.30.2

1 2

[PATCH 1/5] ws2_32: Reimplement getsockopt(SO_TYPE) on top of ws_protocol_info().
by Zebediah Figura 01 Jul '21

01 Jul '21

Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> --- dlls/ws2_32/socket.c | 21 ++++++++------------- 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/dlls/ws2_32/socket.c b/dlls/ws2_32/socket.c index ce71e25d63d..9f32e7eaf96 100644 --- a/dlls/ws2_32/socket.c +++ b/dlls/ws2_32/socket.c @@ -2259,27 +2259,22 @@ INT WINAPI WS_getsockopt(SOCKET s, INT level, case WS_SO_TYPE: { - int sock_type; + WSAPROTOCOL_INFOW info; + int size; + if (!optlen || *optlen < sizeof(int) || !optval) { SetLastError(WSAEFAULT); return SOCKET_ERROR; } - if ( (fd = get_sock_fd( s, 0, NULL )) == -1) - return SOCKET_ERROR; - sock_type = _get_fd_type(fd); - if (sock_type == -1) - { - SetLastError(wsaErrno()); - ret = SOCKET_ERROR; - } - else - (*(int *)optval) = convert_socktype_u2w(sock_type); + if (!ws_protocol_info( s, TRUE, &info, &size )) + return -1; - release_sock_fd( s, fd ); - return ret; + *(int *)optval = info.iSocketType; + return 0; } + default: TRACE("Unknown SOL_SOCKET optname: 0x%08x\n", optname); SetLastError(WSAENOPROTOOPT); -- 2.30.2

2 6

Jump to page: