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 eac56fbda547e21cf9f40d57c913b3b582fc5697.

Browse Source
This commit is contained in:
Sebastian Lackner
2016-10-09 06:14:31 +02:00
parent 8bfc3ca97f
commit 2c7ec3747f
8 changed files with 202 additions and 206 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
patches/kernel32-Named_Pipe/0014-kernel32-tests-Add-tests-for-PIPE_NOWAIT-in-message-.patch
View File

@@ -1,4 +1,4 @@
From ac80ddfb739fbe5d743c97715431d0f2e038830c Mon Sep 17 00:00:00 2001
From c5fd5022f2e8a00a520f030919394f1b2b6559d4 Mon Sep 17 00:00:00 2001
From: Sebastian Lackner <sebastian@fds-team.de>
Date: Mon, 11 Aug 2014 04:19:49 +0200
Subject: kernel32/tests: Add tests for PIPE_NOWAIT in message mode.
@@ -8,7 +8,7 @@ Subject: kernel32/tests: Add tests for PIPE_NOWAIT in message mode.
1 file changed, 96 insertions(+)
diff --git a/dlls/kernel32/tests/pipe.c b/dlls/kernel32/tests/pipe.c
index 3388833..4d782bd 100644
index 81d4d39..18b371c 100644
--- a/dlls/kernel32/tests/pipe.c
+++ b/dlls/kernel32/tests/pipe.c
@@ -2619,6 +2619,101 @@ static void test_overlapped_error(void)
@@ -113,14 +113,14 @@ index 3388833..4d782bd 100644
static void test_NamedPipeHandleState(void)
{
HANDLE server, client;
@@ -3043,6 +3138,7 @@ START_TEST(pipe)
@@ -3114,6 +3209,7 @@ START_TEST(pipe)
test_impersonation();
test_overlapped();
test_overlapped_error();
+ test_nowait();
test_NamedPipeHandleState();
test_GetNamedPipeInfo();
test_readfileex_pending();
}
--
2.7.1
2.9.0

14
patches/kernel32-Named_Pipe/0015-ntdll-Allow-to-set-PIPE_NOWAIT-on-byte-mode-pipes.patch
View File

@@ -1,4 +1,4 @@
From 2a458a2f67321fb801ad6203b21e644123dc90fa Mon Sep 17 00:00:00 2001
From 8ce5ed62d1e49a3e738a8287e4611fe9f63437e0 Mon Sep 17 00:00:00 2001
From: Sebastian Lackner <sebastian@fds-team.de>
Date: Mon, 11 Aug 2014 05:34:19 +0200
Subject: ntdll: Allow to set PIPE_NOWAIT on byte-mode pipes.
@@ -12,7 +12,7 @@ matches the native implementation.
2 files changed, 31 insertions(+), 8 deletions(-)
diff --git a/dlls/kernel32/tests/pipe.c b/dlls/kernel32/tests/pipe.c
index 4d782bd..3cdbd93 100644
index 18b371c..55f8d4f 100644
--- a/dlls/kernel32/tests/pipe.c
+++ b/dlls/kernel32/tests/pipe.c
@@ -2619,7 +2619,7 @@ static void test_overlapped_error(void)
@@ -84,7 +84,7 @@ index 4d782bd..3cdbd93 100644
readden = 0xdeadbeef;
SetLastError(0xdeadbeef);
@@ -3138,7 +3158,8 @@ START_TEST(pipe)
@@ -3209,7 +3229,8 @@ START_TEST(pipe)
test_impersonation();
test_overlapped();
test_overlapped_error();
@@ -92,13 +92,13 @@ index 4d782bd..3cdbd93 100644
+ test_nowait(PIPE_TYPE_BYTE);
+ test_nowait(PIPE_TYPE_MESSAGE | PIPE_READMODE_MESSAGE);
test_NamedPipeHandleState();
test_GetNamedPipeInfo();
test_readfileex_pending();
}
diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c
index ac4d69a..06e5e9b 100644
index 622cc45..c27a13f 100644
--- a/dlls/ntdll/file.c
+++ b/dlls/ntdll/file.c
@@ -568,6 +568,8 @@ static NTSTATUS read_unix_fd(int fd, char *buf, ULONG *total, ULONG length,
@@ -573,6 +573,8 @@ static NTSTATUS read_unix_fd(int fd, char *buf, ULONG *total, ULONG length,
if (ret < 0) ERR("dequeue message failed reason: %s\n", strerror(errno));
}
}
@@ -108,5 +108,5 @@ index ac4d69a..06e5e9b 100644
result = read( fd, buf + *total, length - *total );
--
2.7.1
2.9.0