Rebase against e8b9bda53ac39c913ddc93de0308f0c8b69605fc.

This commit is contained in:
Sebastian Lackner
2015-10-12 20:14:46 +02:00
parent cc0556df4a
commit e3ea1eef0d
13 changed files with 30 additions and 3483 deletions

View File

@@ -1,4 +1,4 @@
From b46067fb4e438d40d2145449132da6769399576a Mon Sep 17 00:00:00 2001
From becf0b7c08c28e5afee2641b89e29ad8c0952ef8 Mon Sep 17 00:00:00 2001
From: Dmitry Timoshkov <dmitry@baikal.ru>
Date: Thu, 16 Oct 2014 23:24:37 +0200
Subject: ntdll: Implement NtQuerySection. (try 2)
@@ -14,7 +14,7 @@ Some small modifications by Sebastian Lackner <sebastian@fds-team.de>
6 files changed, 147 insertions(+), 22 deletions(-)
diff --git a/dlls/ntdll/nt.c b/dlls/ntdll/nt.c
index 3601c0f..76786ef 100644
index 2acaa83..490d55f 100644
--- a/dlls/ntdll/nt.c
+++ b/dlls/ntdll/nt.c
@@ -646,25 +646,6 @@ NTSTATUS WINAPI NtPrivilegeCheck(
@@ -44,7 +44,7 @@ index 3601c0f..76786ef 100644
*/
diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec
index 28165ef..7476fd6 100644
index 38422ae..73ae405 100644
--- a/dlls/ntdll/ntdll.spec
+++ b/dlls/ntdll/ntdll.spec
@@ -263,7 +263,7 @@
@@ -56,20 +56,20 @@ index 28165ef..7476fd6 100644
@ stdcall NtQuerySecurityObject (long long long long long)
@ stdcall NtQuerySemaphore (long long ptr long ptr)
@ stdcall NtQuerySymbolicLinkObject(long ptr ptr)
@@ -1144,7 +1144,7 @@
@ stdcall ZwQueryPerformanceCounter (long long) NtQueryPerformanceCounter
@@ -1178,7 +1178,7 @@
@ stdcall ZwQueryPerformanceCounter(ptr ptr) NtQueryPerformanceCounter
# @ stub ZwQueryPortInformationProcess
# @ stub ZwQueryQuotaInformationFile
-@ stdcall ZwQuerySection (long long long long long) NtQuerySection
+@ stdcall ZwQuerySection(long long ptr long ptr) NtQuerySection
@ stdcall ZwQuerySecurityObject (long long long long long) NtQuerySecurityObject
@ stdcall ZwQuerySemaphore (long long long long long) NtQuerySemaphore
@ stdcall ZwQuerySemaphore(long long ptr long ptr) NtQuerySemaphore
@ stdcall ZwQuerySymbolicLinkObject(long ptr ptr) NtQuerySymbolicLinkObject
diff --git a/dlls/ntdll/virtual.c b/dlls/ntdll/virtual.c
index 0629816..f1e71ac 100644
index 4d4bc3b..bfe53cb 100644
--- a/dlls/ntdll/virtual.c
+++ b/dlls/ntdll/virtual.c
@@ -2574,6 +2574,101 @@ NTSTATUS WINAPI NtOpenSection( HANDLE *handle, ACCESS_MASK access, const OBJECT_
@@ -2531,6 +2531,101 @@ NTSTATUS WINAPI NtOpenSection( HANDLE *handle, ACCESS_MASK access, const OBJECT_
/***********************************************************************
@@ -172,7 +172,7 @@ index 0629816..f1e71ac 100644
* ZwMapViewOfSection (NTDLL.@)
*/
diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec
index 11d1c62..39325ad 100644
index 1957a9a..276cdbf5 100644
--- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec
+++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec
@@ -1351,7 +1351,7 @@
@@ -270,10 +270,10 @@ index 16e7c1c..ba26d1e 100644
if ((fd = get_obj_fd( &mapping->obj )))
{
diff --git a/server/protocol.def b/server/protocol.def
index 9c4dab4..2513098 100644
index c313006..4e07c10 100644
--- a/server/protocol.def
+++ b/server/protocol.def
@@ -1641,6 +1641,13 @@ enum char_info_mode
@@ -1674,6 +1674,13 @@ enum char_info_mode
int protect; /* protection flags */
int header_size; /* header size (for VPROT_IMAGE mapping) */
client_ptr_t base; /* default base addr (for VPROT_IMAGE mapping) */
@@ -288,5 +288,5 @@ index 9c4dab4..2513098 100644
obj_handle_t shared_file; /* shared mapping file handle */
@END
--
2.4.0
2.6.1