marko10_000
/
wine-wine
forked from Mirrors/wine-wine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ntdll: Fix NtDuplicateObject to only close the file descriptor if it's in the same process.

oldstable
Alexandre Julliard 2007-01-18 12:18:51 +01:00
parent 027491f6af
commit 3410354d61
5 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
dlls/ntdll/om.c
View File

@ -314,8 +314,11 @@ NTSTATUS WINAPI NtDuplicateObject( HANDLE source_process, HANDLE source,
if (dest) *dest = reply->handle; if (dest) *dest = reply->handle;
if (reply->closed) if (reply->closed)
{ {
int fd = server_remove_fd_from_cache( source ); if (reply->self)
if (fd != -1) close( fd ); {
int fd = server_remove_fd_from_cache( source );
if (fd != -1) close( fd );
}
} }
else if (options & DUPLICATE_CLOSE_SOURCE) else if (options & DUPLICATE_CLOSE_SOURCE)
WARN( "failed to close handle %p in process %p\n", source, source_process ); WARN( "failed to close handle %p in process %p\n", source, source_process );

3
include/wine/server_protocol.h
View File

@ -740,6 +740,7 @@ struct dup_handle_reply
{ {
struct reply_header __header; struct reply_header __header;
obj_handle_t handle; obj_handle_t handle;
int self;
int closed; int closed;
}; };
#define DUP_HANDLE_CLOSE_SOURCE DUPLICATE_CLOSE_SOURCE #define DUP_HANDLE_CLOSE_SOURCE DUPLICATE_CLOSE_SOURCE
@ -4575,6 +4576,6 @@ union generic_reply
struct query_symlink_reply query_symlink_reply; struct query_symlink_reply query_symlink_reply;
}; };
#define SERVER_PROTOCOL_VERSION 270 #define SERVER_PROTOCOL_VERSION 271
#endif /* __WINE_WINE_SERVER_PROTOCOL_H */ #endif /* __WINE_WINE_SERVER_PROTOCOL_H */

1
server/handle.c
View File

@ -536,6 +536,7 @@ DECL_HANDLER(dup_handle)
reply->closed = close_handle( src, req->src_handle ); reply->closed = close_handle( src, req->src_handle );
set_error( err ); set_error( err );
} }
reply->self = (src == current->process);
release_object( src ); release_object( src );
} }
} }

1
server/protocol.def
View File

@ -635,6 +635,7 @@ typedef union
unsigned int options; /* duplicate options (see below) */ unsigned int options; /* duplicate options (see below) */
@REPLY @REPLY
obj_handle_t handle; /* duplicated handle in dst process */ obj_handle_t handle; /* duplicated handle in dst process */
int self; /* is the source the current process? */
int closed; /* whether the source handle has been closed */ int closed; /* whether the source handle has been closed */
@END @END
#define DUP_HANDLE_CLOSE_SOURCE DUPLICATE_CLOSE_SOURCE #define DUP_HANDLE_CLOSE_SOURCE DUPLICATE_CLOSE_SOURCE

1
server/trace.c
View File

@ -1025,6 +1025,7 @@ static void dump_dup_handle_request( const struct dup_handle_request *req )
static void dump_dup_handle_reply( const struct dup_handle_reply *req ) static void dump_dup_handle_reply( const struct dup_handle_reply *req )
{ {
fprintf( stderr, " handle=%p,", req->handle ); fprintf( stderr, " handle=%p,", req->handle );
fprintf( stderr, " self=%d,", req->self );
fprintf( stderr, " closed=%d", req->closed ); fprintf( stderr, " closed=%d", req->closed );
} }