You've already forked wine-staging
mirror of
https://gitlab.winehq.org/wine/wine-staging.git
synced 2025-09-12 18:50:20 -07:00
Rebase against 7b62a970e9ad3b4179394cf54f0232475fe2388a
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
From d0df8b13a6233a3dc91be942b83747fe999c276e Mon Sep 17 00:00:00 2001
|
||||
From b3d58f9ec43100fd41643a9cb3f8bf5a5308a0c4 Mon Sep 17 00:00:00 2001
|
||||
From: Louis Lenders <xerox.xerox2000x@gmail.com>
|
||||
Date: Mon, 16 Jan 2017 12:12:39 +0100
|
||||
Subject: ntdll: Improve stub for NtAllocateUuids
|
||||
@@ -15,10 +15,10 @@ Signed-off-by: Louis Lenders <xerox.xerox2000x@gmail.com>
|
||||
4 files changed, 8 insertions(+), 7 deletions(-)
|
||||
|
||||
diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec
|
||||
index 28dc60c40a2..7d6c7447d79 100644
|
||||
index 6e996a5..7a1112c 100644
|
||||
--- a/dlls/ntdll/ntdll.spec
|
||||
+++ b/dlls/ntdll/ntdll.spec
|
||||
@@ -109,7 +109,7 @@
|
||||
@@ -111,7 +111,7 @@
|
||||
@ stdcall NtAlertThread(long)
|
||||
@ stdcall NtAllocateLocallyUniqueId(ptr)
|
||||
# @ stub NtAllocateUserPhysicalPages
|
||||
@@ -27,7 +27,7 @@ index 28dc60c40a2..7d6c7447d79 100644
|
||||
@ stdcall NtAllocateVirtualMemory(long ptr long ptr long long)
|
||||
@ stdcall NtAreMappedFilesTheSame(ptr ptr)
|
||||
@ stdcall NtAssignProcessToJobObject(long long)
|
||||
@@ -1035,7 +1035,7 @@
|
||||
@@ -1039,7 +1039,7 @@
|
||||
@ stdcall -private ZwAlertThread(long) NtAlertThread
|
||||
@ stdcall -private ZwAllocateLocallyUniqueId(ptr) NtAllocateLocallyUniqueId
|
||||
# @ stub ZwAllocateUserPhysicalPages
|
||||
@@ -37,7 +37,7 @@ index 28dc60c40a2..7d6c7447d79 100644
|
||||
@ stdcall -private ZwAreMappedFilesTheSame(ptr ptr) NtAreMappedFilesTheSame
|
||||
@ stdcall -private ZwAssignProcessToJobObject(long long) NtAssignProcessToJobObject
|
||||
diff --git a/dlls/ntdll/om.c b/dlls/ntdll/om.c
|
||||
index 1279f2bb4c6..c13934a89bd 100644
|
||||
index 1279f2b..c13934a 100644
|
||||
--- a/dlls/ntdll/om.c
|
||||
+++ b/dlls/ntdll/om.c
|
||||
@@ -691,10 +691,11 @@ NTSTATUS WINAPI NtQuerySymbolicLinkObject( HANDLE handle, PUNICODE_STRING target
|
||||
@@ -56,23 +56,23 @@ index 1279f2bb4c6..c13934a89bd 100644
|
||||
|
||||
/**************************************************************************
|
||||
diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec
|
||||
index 62ceaceeea6..bba67d71c7d 100644
|
||||
index 7f43704..24b40c3 100644
|
||||
--- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec
|
||||
+++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec
|
||||
@@ -736,7 +736,7 @@
|
||||
@ stdcall NtAddAtom(ptr long ptr) ntdll.NtAddAtom
|
||||
@ stdcall NtAdjustPrivilegesToken(long long ptr long ptr ptr) ntdll.NtAdjustPrivilegesToken
|
||||
@ stdcall NtAllocateLocallyUniqueId(ptr) ntdll.NtAllocateLocallyUniqueId
|
||||
-@ stdcall NtAllocateUuids(ptr ptr ptr) ntdll.NtAllocateUuids
|
||||
+@ stdcall NtAllocateUuids(ptr ptr ptr ptr) ntdll.NtAllocateUuids
|
||||
@ stdcall NtAllocateVirtualMemory(long ptr long ptr long long) ntdll.NtAllocateVirtualMemory
|
||||
@@ -740,7 +740,7 @@
|
||||
@ stdcall NtAddAtom(ptr long ptr)
|
||||
@ stdcall NtAdjustPrivilegesToken(long long ptr long ptr ptr)
|
||||
@ stdcall NtAllocateLocallyUniqueId(ptr)
|
||||
-@ stdcall NtAllocateUuids(ptr ptr ptr)
|
||||
+@ stdcall NtAllocateUuids(ptr ptr ptr ptr)
|
||||
@ stdcall NtAllocateVirtualMemory(long ptr long ptr long long)
|
||||
@ stub NtBuildNumber
|
||||
@ stdcall NtClose(long) ntdll.NtClose
|
||||
@ stdcall NtClose(long)
|
||||
diff --git a/include/winternl.h b/include/winternl.h
|
||||
index f35091cba1a..bf6e4f50410 100644
|
||||
index c3cca80..b861c4e 100644
|
||||
--- a/include/winternl.h
|
||||
+++ b/include/winternl.h
|
||||
@@ -2159,7 +2159,7 @@ NTSYSAPI NTSTATUS WINAPI NtAdjustPrivilegesToken(HANDLE,BOOLEAN,PTOKEN_PRIVILEG
|
||||
@@ -2231,7 +2231,7 @@ NTSYSAPI NTSTATUS WINAPI NtAdjustPrivilegesToken(HANDLE,BOOLEAN,PTOKEN_PRIVILEG
|
||||
NTSYSAPI NTSTATUS WINAPI NtAlertResumeThread(HANDLE,PULONG);
|
||||
NTSYSAPI NTSTATUS WINAPI NtAlertThread(HANDLE ThreadHandle);
|
||||
NTSYSAPI NTSTATUS WINAPI NtAllocateLocallyUniqueId(PLUID lpLuid);
|
||||
@@ -82,5 +82,5 @@ index f35091cba1a..bf6e4f50410 100644
|
||||
NTSYSAPI NTSTATUS WINAPI NtAreMappedFilesTheSame(PVOID,PVOID);
|
||||
NTSYSAPI NTSTATUS WINAPI NtAssignProcessToJobObject(HANDLE,HANDLE);
|
||||
--
|
||||
2.11.0
|
||||
2.7.4
|
||||
|
||||
|
||||
Reference in New Issue
Block a user