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 8676f7bae099f0ca20c26a29dfa4bebd828b39b9.

Browse Source
This commit is contained in:
Sebastian Lackner
2016-01-22 02:26:54 +01:00
parent b1e6717b81
commit fe47c7cf07
4 changed files with 70 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,4 +1,4 @@
From ffd7b942761e5010bdc234f10e5e9721c8d8159b Mon Sep 17 00:00:00 2001
From 82f162911442f78bae91fe8655cd2f4a33f638f7 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 42d1fae..3bb2905 100644
index 8e6dc12..15a957d 100644
--- a/dlls/ntdll/file.c
+++ b/dlls/ntdll/file.c
@@ -1213,6 +1213,9 @@ static NTSTATUS write_unix_fd(int fd, const char *buf, ULONG *total, ULONG lengt
@@ -1210,6 +1210,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,7 +39,7 @@ index 42d1fae..3bb2905 100644
}
}
diff --git a/server/named_pipe.c b/server/named_pipe.c
index 37f97ed..28816a2 100644
index 2297976..1759b00 100644
--- a/server/named_pipe.c
+++ b/server/named_pipe.c
@@ -145,6 +145,7 @@ static const struct object_ops named_pipe_ops =
@@ -84,8 +84,8 @@ index 37f97ed..28816a2 100644
+
static void named_pipe_dump( struct object *obj, int verbose )
{
struct named_pipe *pipe = (struct named_pipe *) obj;
@@ -390,6 +394,23 @@ static void do_disconnect( struct pipe_server *server )
fputs( "Named pipe\n", stderr );
@@ -386,6 +390,23 @@ static void do_disconnect( struct pipe_server *server )
server->fd = NULL;
}
@@ -109,7 +109,7 @@ index 37f97ed..28816a2 100644
static void pipe_server_destroy( struct object *obj)
{
struct pipe_server *server = (struct pipe_server *)obj;
@@ -416,6 +437,24 @@ static void pipe_server_destroy( struct object *obj)
@@ -412,6 +433,24 @@ static void pipe_server_destroy( struct object *obj)
release_object( server->pipe );
}
@@ -135,10 +135,10 @@ index 37f97ed..28816a2 100644
{
struct pipe_client *client = (struct pipe_client *)obj;
diff --git a/server/protocol.def b/server/protocol.def
index 6b2030b..390c09a 100644
index e6e52de..4a24595 100644
--- a/server/protocol.def
+++ b/server/protocol.def
@@ -2389,6 +2389,7 @@ enum message_type
@@ -2378,6 +2378,7 @@ enum message_type
#define NAMED_PIPE_MESSAGE_STREAM_WRITE 0x0001
#define NAMED_PIPE_MESSAGE_STREAM_READ 0x0002
#define NAMED_PIPE_NONBLOCKING_MODE 0x0004
@@ -147,5 +147,5 @@ index 6b2030b..390c09a 100644
/* Get named pipe information by handle */
--
2.6.2
2.6.4