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

Add patches to fix current Unity3D webplayer.

Browse Source
This commit is contained in:
Michael Müller
2014-05-31 03:42:21 +02:00
parent 01be545e92
commit 457c0bf7e1
7 changed files with 143 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
patches/05-Named_Pipe/0001-kernel32-Change-return-value-of-stub-SetNamedPipeHandl.patch Normal file
View File

@@ -0,0 +1,44 @@
From 852f784dd4dd407d1183c01ce43c1a8e07231275 Mon Sep 17 00:00:00 2001
From: Sebastian Lackner <sebastian@fds-team.de>
Date: Sat, 26 Oct 2013 19:39:33 +0200
Subject: kernel32: Change return value of stub SetNamedPipeHandleState to
TRUE
---
dlls/kernel32/sync.c | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/dlls/kernel32/sync.c b/dlls/kernel32/sync.c
index 5b7f810..331188f 100644
--- a/dlls/kernel32/sync.c
+++ b/dlls/kernel32/sync.c
@@ -1730,7 +1730,8 @@ BOOL WINAPI SetNamedPipeHandleState(
* runtime, and it slows down InstallShield a fair bit. */
WARN("stub: %p %p/%d %p %p\n",
hNamedPipe, lpMode, lpMode ? *lpMode : 0, lpMaxCollectionCount, lpCollectDataTimeout);
- return FALSE;
+ /* some programs expect this to return TRUE, and will abort otherwise */
+ return TRUE;
}
/***********************************************************************
@@ -1793,14 +1794,12 @@ BOOL WINAPI CallNamedPipeW(
mode = PIPE_READMODE_MESSAGE;
ret = SetNamedPipeHandleState(pipe, &mode, NULL, NULL);
- /* Currently SetNamedPipeHandleState() is a stub returning FALSE */
- if (ret) FIXME("Now that SetNamedPipeHandleState() is more than a stub, please update CallNamedPipeW\n");
- /*
+ /* Currently SetNamedPipeHandleState() is a stub returning TRUE */
if (!ret)
{
CloseHandle(pipe);
return FALSE;
- }*/
+ }
ret = TransactNamedPipe(pipe, lpInput, lpInputSize, lpOutput, lpOutputSize, lpBytesRead, NULL);
CloseHandle(pipe);
--
1.7.9.5

43
patches/05-Named_Pipe/0002-server-Fix-return-value-for-FSCTL_PIPE_WAIT-if-pipe-.patch Normal file
View File

@@ -0,0 +1,43 @@
From 453924c0861d4d1844f8b48c05dba3b2cf49b4ae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Sat, 31 May 2014 02:44:36 +0200
Subject: server: Fix return value for FSCTL_PIPE_WAIT if pipe does not exist
---
dlls/kernel32/tests/pipe.c | 6 ++++++
server/named_pipe.c | 2 +-
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/dlls/kernel32/tests/pipe.c b/dlls/kernel32/tests/pipe.c
index b192f96..f7c7531 100644
--- a/dlls/kernel32/tests/pipe.c
+++ b/dlls/kernel32/tests/pipe.c
@@ -60,6 +60,12 @@ static void test_CreateNamedPipe(int pipemode)
trace("test_CreateNamedPipe starting in byte mode\n");
else
trace("test_CreateNamedPipe starting in message mode\n");
+
+ /* Wait for non existing pipe */
+ ret = WaitNamedPipeA(PIPENAME, 2000);
+ ok(ret == 0, "WaitNamedPipe returned %d for non existing pipe\n", ret);
+ ok(GetLastError() == ERROR_FILE_NOT_FOUND, "wrong error %u\n", GetLastError());
+
/* Bad parameter checks */
hnp = CreateNamedPipeA("not a named pipe", PIPE_ACCESS_DUPLEX, pipemode | PIPE_WAIT,
/* nMaxInstances */ 1,
diff --git a/server/named_pipe.c b/server/named_pipe.c
index 6ba2145..c9be0c2 100644
--- a/server/named_pipe.c
+++ b/server/named_pipe.c
@@ -887,7 +887,7 @@ static obj_handle_t named_pipe_device_ioctl( struct fd *fd, ioctl_code_t code, c
name.len = (buffer->NameLength / sizeof(WCHAR)) * sizeof(WCHAR);
if (!(pipe = (struct named_pipe *)find_object( device->pipes, &name, OBJ_CASE_INSENSITIVE )))
{
- set_error( STATUS_PIPE_NOT_AVAILABLE );
+ set_error( STATUS_OBJECT_NAME_NOT_FOUND );
return 0;
}
if (!(server = find_available_server( pipe )))
--
1.8.3.2

4
patches/05-Named_Pipe/1d0160c7-42a4-491c-9676-fa3b1859aaab.def Normal file
View File

@@ -0,0 +1,4 @@
Revision: 1
Author: Michael Müller
Title: Fix return value of WaitNamedPipe if pipe does not exist.

4
patches/05-Named_Pipe/cbe240e8-2c58-430a-b61c-7fbb9d0e1e11.def Normal file
View File

@@ -0,0 +1,4 @@
Revision: 1
Author: Sebastian Lackner
Title: Change return value of stub SetNamedPipeHandleState to TRUE.