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 7350682aa6ec7702f26f76ccbaa7d2f11a85c93d.

Browse Source
This commit is contained in:
Sebastian Lackner
2016-01-16 05:23:16 +01:00
parent 6e91988232
commit 6fb052e890
4 changed files with 36 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
patches/kernel32-Named_Pipe/0005-server-Show-warning-if-message-mode-is-not-supported.patch
View File

@@ -1,4 +1,4 @@
From f86aa112cd8f4f4372ea065866f2a98afa5d9d3b Mon Sep 17 00:00:00 2001
From 71b17871cc75d035ca35b9f8641b6604cc9bb600 Mon Sep 17 00:00:00 2001
From: Sebastian Lackner <sebastian@fds-team.de>
Date: Mon, 4 Aug 2014 00:29:26 +0200
Subject: server: Show warning if message mode is not supported.
@@ -13,10 +13,10 @@ missing message mode support.
3 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c
index cd34194..45ff692 100644
index 4cac2ca..d585d6c 100644
--- a/dlls/ntdll/file.c
+++ b/dlls/ntdll/file.c
@@ -3507,6 +3507,7 @@ NTSTATUS WINAPI NtCreateNamedPipeFile( PHANDLE handle, ULONG access,
@@ -3506,6 +3506,7 @@ NTSTATUS WINAPI NtCreateNamedPipeFile( PHANDLE handle, ULONG access,
NTSTATUS status;
data_size_t len;
struct object_attributes *objattr;
@@ -24,7 +24,7 @@ index cd34194..45ff692 100644
TRACE("(%p %x %s %p %x %d %x %d %d %d %d %d %d %p)\n",
handle, access, debugstr_w(attr->ObjectName->Buffer), iosb, sharing, dispo,
@@ -3519,16 +3520,17 @@ NTSTATUS WINAPI NtCreateNamedPipeFile( PHANDLE handle, ULONG access,
@@ -3518,15 +3519,16 @@ NTSTATUS WINAPI NtCreateNamedPipeFile( PHANDLE handle, ULONG access,
if ((status = alloc_object_attributes( attr, &objattr, &len ))) return status;
@@ -35,7 +35,6 @@ index cd34194..45ff692 100644
SERVER_START_REQ( create_named_pipe )
{
req->access = access;
req->attributes = attr->Attributes;
req->options = options;
req->sharing = sharing;
- req->flags =
@@ -46,7 +45,7 @@ index cd34194..45ff692 100644
req->maxinstances = max_inst;
req->outsize = outbound_quota;
req->insize = inbound_quota;
@@ -3536,9 +3538,13 @@ NTSTATUS WINAPI NtCreateNamedPipeFile( PHANDLE handle, ULONG access,
@@ -3534,9 +3536,13 @@ NTSTATUS WINAPI NtCreateNamedPipeFile( PHANDLE handle, ULONG access,
wine_server_add_data( req, objattr, len );
status = wine_server_call( req );
if (!status) *handle = wine_server_ptr_handle( reply->handle );
@@ -61,10 +60,10 @@ index cd34194..45ff692 100644
return status;
}
diff --git a/server/named_pipe.c b/server/named_pipe.c
index 8d5753a..79ca3a1 100644
index acedcc5..94c28b1 100644
--- a/server/named_pipe.c
+++ b/server/named_pipe.c
@@ -933,6 +933,7 @@ DECL_HANDLER(create_named_pipe)
@@ -937,6 +937,7 @@ DECL_HANDLER(create_named_pipe)
return;
}
@@ -73,10 +72,10 @@ index 8d5753a..79ca3a1 100644
if (!objattr_is_valid( objattr, get_req_data_size() ))
diff --git a/server/protocol.def b/server/protocol.def
index ea5bd61..e83e65e 100644
index 4becb8f..9facc59 100644
--- a/server/protocol.def
+++ b/server/protocol.def
@@ -2382,6 +2382,7 @@ enum message_type
@@ -2376,6 +2376,7 @@ enum message_type
unsigned int flags;
VARARG(objattr,object_attributes); /* object attributes */
@REPLY