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 9f55292085392579568ff81b8adb926b32a8d99a.
This commit is contained in:
@@ -1,4 +1,4 @@
|
||||
From 66e1fd2fc1c0a3b55597603b123f0c599faa2b75 Mon Sep 17 00:00:00 2001
|
||||
From 07428b41767dfbbc3de78e32690527a9bc154260 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,19 +10,19 @@ 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 6d63b5bf43f..1d99dd71320 100644
|
||||
index 6d63b5bf43..1d99dd7132 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 40a878539a6..55a93938dcd 100644
|
||||
index f6d95b7802..c20d0812d8 100644
|
||||
--- a/dlls/ntdll/misc.c
|
||||
+++ b/dlls/ntdll/misc.c
|
||||
@@ -457,3 +457,14 @@ ULONG WINAPI EtwUnregisterTraceGuids( TRACEHANDLE RegistrationHandle )
|
||||
FIXME("%s: stub\n", wine_dbgstr_longlong(RegistrationHandle));
|
||||
return ERROR_SUCCESS;
|
||||
@@ -474,3 +474,14 @@ BOOLEAN WINAPI EtwEventEnabled( REGHANDLE handle, const EVENT_DESCRIPTOR *descri
|
||||
FIXME("(%s, %p): stub\n", wine_dbgstr_longlong(handle), descriptor);
|
||||
return FALSE;
|
||||
}
|
||||
+
|
||||
+/*********************************************************************
|
||||
@@ -36,7 +36,7 @@ index 40a878539a6..55a93938dcd 100644
|
||||
+ return TRUE;
|
||||
+}
|
||||
diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec
|
||||
index 28dc60c40a2..076d0d280fe 100644
|
||||
index f8b139a458..59c9978986 100644
|
||||
--- a/dlls/ntdll/ntdll.spec
|
||||
+++ b/dlls/ntdll/ntdll.spec
|
||||
@@ -3,6 +3,7 @@
|
||||
@@ -48,5 +48,5 @@ index 28dc60c40a2..076d0d280fe 100644
|
||||
@ stub CsrAllocateCapturePointer
|
||||
@ stub CsrAllocateMessagePointer
|
||||
--
|
||||
2.11.0
|
||||
2.12.2
|
||||
|
||||
|
Reference in New Issue
Block a user