wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2025-04-13 14:42:51 -07:00
Code Issues Packages Projects Releases Wiki Activity

Rebase against bf83d755d987fec552cd1dce30638c31c49ab760.

Browse Source
This commit is contained in:
Zebediah Figura
2020-05-29 19:13:43 -05:00
parent 4e692b5301
commit 06877e55b1
22 changed files with 785 additions and 1065 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
patches/server-FileEndOfFileInformation/0001-ntdll-Set-EOF-on-file-which-has-a-memory-mapping-sho.patch
View File

@ -1,26 +1,27 @@
From 3b5ea5ff15907d1d8f1902a08451b0a03eb11dc9 Mon Sep 17 00:00:00 2001
From ed63a76dc481da8af510fb8f9ae6c399ca0ca0ac Mon Sep 17 00:00:00 2001
From: Qian Hong <qhong@codeweavers.com>
Date: Fri, 21 Aug 2015 21:58:51 +0800
Subject: ntdll: Set EOF on file which has a memory mapping should fail.
Subject: [PATCH] ntdll: Set EOF on file which has a memory mapping should
fail.
---
dlls/ntdll/file.c | 27 +++++++-------------------
server/fd.c | 55 +++++++++++++++++++++++++++++++++++++++++++++++++++++
server/protocol.def | 7 +++++++
dlls/ntdll/file.c | 27 ++++++----------------
server/fd.c | 55 +++++++++++++++++++++++++++++++++++++++++++++
server/protocol.def | 7 ++++++
3 files changed, 69 insertions(+), 20 deletions(-)
diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c
index be6b591..8c9b076 100644
index 013706889bb..a28ae265687 100644
--- a/dlls/ntdll/file.c
+++ b/dlls/ntdll/file.c
@@ -2650,30 +2650,17 @@ NTSTATUS WINAPI NtSetInformationFile(HANDLE handle, PIO_STATUS_BLOCK io,
@@ -2747,30 +2747,17 @@ NTSTATUS WINAPI NtSetInformationFile(HANDLE handle, PIO_STATUS_BLOCK io,
case FileEndOfFileInformation:
if (len >= sizeof(FILE_END_OF_FILE_INFORMATION))
{
- struct stat st;
const FILE_END_OF_FILE_INFORMATION *info = ptr;
- if ((io->u.Status = server_get_unix_fd( handle, 0, &fd, &needs_close, NULL, NULL )))
- if ((io->u.Status = unix_funcs->server_get_unix_fd( handle, 0, &fd, &needs_close, NULL, NULL )))
- return io->u.Status;
-
- /* first try normal truncate */
@ -52,10 +53,10 @@ index be6b591..8c9b076 100644
case FilePipeInformation:
diff --git a/server/fd.c b/server/fd.c
index fef4827..62373d8 100644
index 06d1d81bdb0..7b016acb382 100644
--- a/server/fd.c
+++ b/server/fd.c
@@ -2353,6 +2353,50 @@ failed:
@@ -2534,6 +2534,50 @@ failed:
free( name );
}
@ -106,7 +107,7 @@ index fef4827..62373d8 100644
struct completion *fd_get_completion( struct fd *fd, apc_param_t *p_key )
{
*p_key = fd->comp_key;
@@ -2593,3 +2637,14 @@ DECL_HANDLER(set_fd_name_info)
@@ -2812,3 +2856,14 @@ DECL_HANDLER(set_fd_name_info)
}
if (root_fd) release_object( root_fd );
}
@ -122,10 +123,10 @@ index fef4827..62373d8 100644
+ }
+}
diff --git a/server/protocol.def b/server/protocol.def
index c313006..8d197f0 100644
index 423e6079009..c6110fc675e 100644
--- a/server/protocol.def
+++ b/server/protocol.def
@@ -3541,6 +3541,13 @@ enum coords_relative
@@ -3821,6 +3821,13 @@ struct handle_info
@END
@ -140,5 +141,5 @@ index c313006..8d197f0 100644
@REQ(get_window_layered_info)
user_handle_t handle; /* handle to the window */
--
2.5.0
2.26.2