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

Browse Source 
[msi-Fix_Stack_Alignment]
Removed patch to fix stack alignment in CUSTOMPROC_wrapper function (accepted
upstream).

[ntdll-FSCTL_PIPE_LISTEN]
Removed patch to avoid updating iosb.Status after FSCTL_PIPE_LISTEN call
(accepted upstream).

[user32-FlashWindowEx]
Removed patch to avoid dereferencing NULL pointer in a trace (accepted
upstream).

[windowscodecs-PNG_Fixes]
Removed patch to fix a copy/paste mistake (accepted upstream).

[winex11-Desktop_Resolution]
Removed patch to allow 320x240 as supported resolution in desktop mode
(accepted upstream).
This commit is contained in:
Sebastian Lackner
2016-04-08 01:43:22 +02:00
parent e8ef34b3a1
commit 57dde8e88f
14 changed files with 122 additions and 640 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
patches/ntdll-Junction_Points/0001-ntdll-Add-support-for-junction-point-creation.patch
View File

@@ -1,4 +1,4 @@
From 0a7a9cfce718a28567b87a5bf6776632af629d41 Mon Sep 17 00:00:00 2001
From 9976a678df5baaa8722f5be1b49962de5bbad9bb Mon Sep 17 00:00:00 2001
From: "Erich E. Hoover" <erich.e.hoover@gmail.com>
Date: Thu, 16 Jan 2014 20:56:49 -0700
Subject: ntdll: Add support for junction point creation.
@@ -12,7 +12,7 @@ Subject: ntdll: Add support for junction point creation.
create mode 100644 include/ntifs.h
diff --git a/dlls/ntdll/file.c b/dlls/ntdll/file.c
index fecec13..d8bb01b 100644
index 93863ac..8c44514 100644
--- a/dlls/ntdll/file.c
+++ b/dlls/ntdll/file.c
@@ -103,12 +103,14 @@
@@ -30,7 +30,7 @@ index fecec13..d8bb01b 100644
#define SECSPERDAY 86400
#define SECS_1601_TO_1970 ((369 * 365 + 89) * (ULONGLONG)SECSPERDAY)
@@ -1655,6 +1657,76 @@ NTSTATUS WINAPI SYSCALL(NtDeviceIoControlFile)(HANDLE handle, HANDLE event,
@@ -1652,6 +1654,76 @@ NTSTATUS WINAPI SYSCALL(NtDeviceIoControlFile)(HANDLE handle, HANDLE event,
}
@@ -107,7 +107,7 @@ index fecec13..d8bb01b 100644
/**************************************************************************
* NtFsControlFile [NTDLL.@]
* ZwFsControlFile [NTDLL.@]
@@ -1803,11 +1875,30 @@ NTSTATUS WINAPI SYSCALL(NtFsControlFile)(HANDLE handle, HANDLE event, PIO_APC_RO
@@ -1805,11 +1877,30 @@ NTSTATUS WINAPI SYSCALL(NtFsControlFile)(HANDLE handle, HANDLE event, PIO_APC_RO
}
break;
}
@@ -135,11 +135,11 @@ index fecec13..d8bb01b 100644
+ break;
+ }
+
case FSCTL_PIPE_LISTEN:
case FSCTL_PIPE_WAIT:
default:
status = server_ioctl_file( handle, event, apc, apc_context, io, code,
diff --git a/dlls/ntdll/tests/file.c b/dlls/ntdll/tests/file.c
index 55e34ad..71e10c2 100644
index fcbf8df..644065f 100644
--- a/dlls/ntdll/tests/file.c
+++ b/dlls/ntdll/tests/file.c
@@ -37,6 +37,7 @@
@@ -150,7 +150,7 @@ index 55e34ad..71e10c2 100644
#ifndef IO_COMPLETION_ALL_ACCESS
#define IO_COMPLETION_ALL_ACCESS 0x001F0003
@@ -4273,6 +4274,98 @@ static void test_query_ea(void)
@@ -4240,6 +4241,98 @@ static void test_query_ea(void)
#undef EA_BUFFER_SIZE
}
@@ -249,17 +249,17 @@ index 55e34ad..71e10c2 100644
START_TEST(file)
{
HMODULE hkernel32 = GetModuleHandleA("kernel32.dll");
@@ -4332,4 +4425,5 @@ START_TEST(file)
@@ -4299,4 +4392,5 @@ START_TEST(file)
test_query_volume_information_file();
test_query_attribute_information_file();
test_query_ea();
+ test_junction_points();
}
diff --git a/include/Makefile.in b/include/Makefile.in
index c5563a2..1e60e08 100644
index ac10691..03c3776 100644
--- a/include/Makefile.in
+++ b/include/Makefile.in
@@ -493,6 +493,7 @@ SRCDIR_INCLUDES = \
@@ -508,6 +508,7 @@ HEADER_SRCS = \
ntddstor.h \
ntdef.h \
ntdsapi.h \
@@ -326,5 +326,5 @@ index 0000000..db07c28
+
+#endif /* __WINE_NTIFS_H */
--
2.6.1
2.7.1