Rebase against 96a48efeeade7359c8c84a8c3a0a9768fb2a6194.

This commit is contained in:
Sebastian Lackner
2017-01-27 00:45:45 +01:00
parent db836be757
commit a6c14e35e7
10 changed files with 39 additions and 392 deletions

View File

@@ -1,4 +1,4 @@
From cf007e14398fed6d26eea0f5f78bebb22c9fc55c Mon Sep 17 00:00:00 2001
From 66e1fd2fc1c0a3b55597603b123f0c599faa2b75 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Fri, 15 Jan 2016 13:17:31 +0100
Subject: ntdll: Add stub for ApiSetQueryApiSetPresence.
@@ -10,18 +10,18 @@ Subject: ntdll: Add stub for ApiSetQueryApiSetPresence.
3 files changed, 13 insertions(+), 1 deletion(-)
diff --git a/dlls/api-ms-win-core-apiquery-l1-1-0/api-ms-win-core-apiquery-l1-1-0.spec b/dlls/api-ms-win-core-apiquery-l1-1-0/api-ms-win-core-apiquery-l1-1-0.spec
index 6d63b5b..1d99dd7 100644
index 6d63b5bf43f..1d99dd71320 100644
--- a/dlls/api-ms-win-core-apiquery-l1-1-0/api-ms-win-core-apiquery-l1-1-0.spec
+++ b/dlls/api-ms-win-core-apiquery-l1-1-0/api-ms-win-core-apiquery-l1-1-0.spec
@@ -1 +1 @@
-@ stub ApiSetQueryApiSetPresence
+@ stdcall ApiSetQueryApiSetPresence(ptr ptr) ntdll.ApiSetQueryApiSetPresence
diff --git a/dlls/ntdll/misc.c b/dlls/ntdll/misc.c
index de14e80..2f4cfa0 100644
index 40a878539a6..55a93938dcd 100644
--- a/dlls/ntdll/misc.c
+++ b/dlls/ntdll/misc.c
@@ -435,3 +435,14 @@ ULONG WINAPI EtwRegisterTraceGuidsA( WMIDPREQUEST RequestAddress,
debugstr_a(MofResourceName), RegistrationHandle);
@@ -457,3 +457,14 @@ ULONG WINAPI EtwUnregisterTraceGuids( TRACEHANDLE RegistrationHandle )
FIXME("%s: stub\n", wine_dbgstr_longlong(RegistrationHandle));
return ERROR_SUCCESS;
}
+
@@ -36,7 +36,7 @@ index de14e80..2f4cfa0 100644
+ return TRUE;
+}
diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec
index d9937b3..11ca926 100644
index 28dc60c40a2..076d0d280fe 100644
--- a/dlls/ntdll/ntdll.spec
+++ b/dlls/ntdll/ntdll.spec
@@ -3,6 +3,7 @@
@@ -48,5 +48,5 @@ index d9937b3..11ca926 100644
@ stub CsrAllocateCapturePointer
@ stub CsrAllocateMessagePointer
--
2.9.0
2.11.0