wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2025-09-12 18:50:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

Rebase against f55db7882db25019e1af1a497bd7723d10541989.

Browse Source
This commit is contained in:
Sebastian Lackner
2016-02-05 18:35:11 +01:00
parent 661976a145
commit f6e35db051
6 changed files with 264 additions and 264 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
patches/kernel32-Named_Pipe/0020-server-Return-correct-error-codes-for-NtWriteFile-wh.patch
View File

@@ -1,4 +1,4 @@
From 82f162911442f78bae91fe8655cd2f4a33f638f7 Mon Sep 17 00:00:00 2001
From f31780d39178e9e4aa98962d04a51e4f7440757d Mon Sep 17 00:00:00 2001
From: Sebastian Lackner <sebastian@fds-team.de>
Date: Sat, 6 Jun 2015 01:21:05 +0200
Subject: server: Return correct error codes for NtWriteFile when pipes are
@@ -25,10 +25,10 @@ index 3035dd4..9986337 100644
CloseHandle(hfile);
diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c
index 8e6dc12..15a957d 100644
index a925899..af4b64e 100644
--- a/dlls/ntdll/file.c
+++ b/dlls/ntdll/file.c
@@ -1210,6 +1210,9 @@ static NTSTATUS write_unix_fd(int fd, const char *buf, ULONG *total, ULONG lengt
@@ -1211,6 +1211,9 @@ static NTSTATUS write_unix_fd(int fd, const char *buf, ULONG *total, ULONG lengt
return STATUS_SUCCESS;
else if (errno == EFAULT)
return STATUS_INVALID_USER_BUFFER;
@@ -39,10 +39,10 @@ index 8e6dc12..15a957d 100644
}
}
diff --git a/server/named_pipe.c b/server/named_pipe.c
index 2297976..1759b00 100644
index 55c0db7..e4dbf26 100644
--- a/server/named_pipe.c
+++ b/server/named_pipe.c
@@ -145,6 +145,7 @@ static const struct object_ops named_pipe_ops =
@@ -147,6 +147,7 @@ static const struct object_ops named_pipe_ops =
/* server end functions */
static void pipe_server_dump( struct object *obj, int verbose );
static struct fd *pipe_server_get_fd( struct object *obj );
@@ -50,8 +50,8 @@ index 2297976..1759b00 100644
static void pipe_server_destroy( struct object *obj);
static obj_handle_t pipe_server_flush( struct fd *fd, const async_data_t *async, int blocking );
static enum server_fd_type pipe_server_get_fd_type( struct fd *fd );
@@ -168,7 +169,7 @@ static const struct object_ops pipe_server_ops =
no_lookup_name, /* lookup_name */
@@ -172,7 +173,7 @@ static const struct object_ops pipe_server_ops =
NULL, /* unlink_name */
no_open_file, /* open_file */
no_alloc_handle, /* alloc_handle */
- fd_close_handle, /* close_handle */
@@ -59,7 +59,7 @@ index 2297976..1759b00 100644
pipe_server_destroy /* destroy */
};
@@ -190,6 +191,7 @@ static const struct fd_ops pipe_server_fd_ops =
@@ -194,6 +195,7 @@ static const struct fd_ops pipe_server_fd_ops =
static void pipe_client_dump( struct object *obj, int verbose );
static int pipe_client_signaled( struct object *obj, struct wait_queue_entry *entry );
static struct fd *pipe_client_get_fd( struct object *obj );
@@ -67,8 +67,8 @@ index 2297976..1759b00 100644
static void pipe_client_destroy( struct object *obj );
static obj_handle_t pipe_client_flush( struct fd *fd, const async_data_t *async, int blocking );
static enum server_fd_type pipe_client_get_fd_type( struct fd *fd );
@@ -211,7 +213,7 @@ static const struct object_ops pipe_client_ops =
no_lookup_name, /* lookup_name */
@@ -217,7 +219,7 @@ static const struct object_ops pipe_client_ops =
NULL, /* unlink_name */
no_open_file, /* open_file */
no_alloc_handle, /* alloc_handle */
- fd_close_handle, /* close_handle */
@@ -76,7 +76,7 @@ index 2297976..1759b00 100644
pipe_client_destroy /* destroy */
};
@@ -276,6 +278,8 @@ static const struct fd_ops named_pipe_device_fd_ops =
@@ -284,6 +286,8 @@ static const struct fd_ops named_pipe_device_fd_ops =
default_fd_cancel_async /* cancel_async */
};
@@ -85,7 +85,7 @@ index 2297976..1759b00 100644
static void named_pipe_dump( struct object *obj, int verbose )
{
fputs( "Named pipe\n", stderr );
@@ -386,6 +390,23 @@ static void do_disconnect( struct pipe_server *server )
@@ -394,6 +398,23 @@ static void do_disconnect( struct pipe_server *server )
server->fd = NULL;
}
@@ -109,7 +109,7 @@ index 2297976..1759b00 100644
static void pipe_server_destroy( struct object *obj)
{
struct pipe_server *server = (struct pipe_server *)obj;
@@ -412,6 +433,24 @@ static void pipe_server_destroy( struct object *obj)
@@ -420,6 +441,24 @@ static void pipe_server_destroy( struct object *obj)
release_object( server->pipe );
}
@@ -135,7 +135,7 @@ index 2297976..1759b00 100644
{
struct pipe_client *client = (struct pipe_client *)obj;
diff --git a/server/protocol.def b/server/protocol.def
index e6e52de..4a24595 100644
index 2d87f03..1dc70d4 100644
--- a/server/protocol.def
+++ b/server/protocol.def
@@ -2378,6 +2378,7 @@ enum message_type
@@ -147,5 +147,5 @@ index e6e52de..4a24595 100644
/* Get named pipe information by handle */
--
2.6.4
2.7.0