Rebase against 9a53298eed493080fb132d0cd57fffa95b00b1ec.

This commit is contained in:
Sebastian Lackner
2017-10-05 05:12:57 +02:00
parent 48c730f761
commit 3945cbfe36
9 changed files with 70 additions and 171 deletions

View File

@@ -1,4 +1,4 @@
From 84fb1ffc2b569926c2e6a303922706d068361301 Mon Sep 17 00:00:00 2001
From de5759f4160f1cb0d163d629ba55dc7b516dbcee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Tue, 21 Mar 2017 23:27:06 +0100
Subject: ntdll: Add stub for RtlGetUnloadEventTraceEx.
@@ -9,22 +9,22 @@ Subject: ntdll: Add stub for RtlGetUnloadEventTraceEx.
2 files changed, 15 insertions(+)
diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec
index 9921b4cb1c..3c50e20a8b 100644
index c6f15c53ded..243ecb67ae4 100644
--- a/dlls/ntdll/ntdll.spec
+++ b/dlls/ntdll/ntdll.spec
@@ -669,6 +669,7 @@
@@ -670,6 +670,7 @@
# @ stub RtlGetSetBootStatusData
@ stdcall RtlGetThreadErrorMode()
# @ stub RtlGetUnloadEventTrace
@ stdcall RtlGetUnloadEventTrace()
+@ stdcall RtlGetUnloadEventTraceEx(ptr ptr ptr)
@ stub RtlGetUserInfoHeap
@ stdcall RtlGetVersion(ptr)
@ stub RtlGuidToPropertySetName
diff --git a/dlls/ntdll/rtl.c b/dlls/ntdll/rtl.c
index 9b1fbbbcf5..098378c646 100644
index 8ade7525f0e..315dac2c1ea 100644
--- a/dlls/ntdll/rtl.c
+++ b/dlls/ntdll/rtl.c
@@ -1675,3 +1675,17 @@ NTSTATUS WINAPI RtlQueryPackageIdentity(HANDLE token, WCHAR *fullname, SIZE_T *f
@@ -1682,3 +1682,17 @@ NTSTATUS WINAPI RtlQueryPackageIdentity(HANDLE token, WCHAR *fullname, SIZE_T *f
FIXME("(%p, %p, %p, %p, %p, %p): stub\n", token, fullname, fullname_size, appid, appid_size, packaged);
return STATUS_NOT_FOUND;
}
@@ -43,5 +43,5 @@ index 9b1fbbbcf5..098378c646 100644
+ if (trace) *trace = NULL;
+}
--
2.11.0
2.14.1