mirror of
https://gitlab.winehq.org/wine/wine-staging.git
synced 2024-11-21 16:46:54 -08:00
Rebase against 6bc0ce26a853b51f11958545bfa5570bdcb1cf01.
[authz-Stub_Functions] Removed patch to implement additional stub functions in authz.dll (accepted upstream).
This commit is contained in:
Sebastian Lackner
parent
15c75d5194
commit
c6c15ab214
@ -1,119 +0,0 @@
|
||||
From 8d0a3775bda50733b566626b4ac0eb6d96be3e84 Mon Sep 17 00:00:00 2001
|
||||
From: Zhenbo Li <litimetal@gmail.com>
|
||||
Date: Thu, 17 Sep 2015 16:11:06 +0800
|
||||
Subject: authz: Added additional stub functions.
|
||||
|
||||
---
|
||||
dlls/authz/authz.c | 66 +++++++++++++++++++++++++++++++++++++++++++++++++++
|
||||
dlls/authz/authz.spec | 8 +++----
|
||||
2 files changed, 70 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/dlls/authz/authz.c b/dlls/authz/authz.c
|
||||
index 08ca8c3..5755ab2 100644
|
||||
--- a/dlls/authz/authz.c
|
||||
+++ b/dlls/authz/authz.c
|
||||
@@ -25,6 +25,16 @@
|
||||
|
||||
WINE_DEFAULT_DEBUG_CHANNEL(authz);
|
||||
|
||||
+DECLARE_HANDLE(AUTHZ_ACCESS_CHECK_RESULTS_HANDLE);
|
||||
+DECLARE_HANDLE(AUTHZ_CLIENT_CONTEXT_HANDLE);
|
||||
+DECLARE_HANDLE(AUTHZ_RESOURCE_MANAGER_HANDLE);
|
||||
+DECLARE_HANDLE(AUTHZ_AUDIT_EVENT_HANDLE);
|
||||
+
|
||||
+typedef AUTHZ_ACCESS_CHECK_RESULTS_HANDLE *PAUTHZ_ACCESS_CHECK_RESULTS_HANDLE;
|
||||
+typedef AUTHZ_CLIENT_CONTEXT_HANDLE *PAUTHZ_CLIENT_CONTEXT_HANDLE;
|
||||
+typedef struct _AUTHZ_ACCESS_REQUEST *PAUTHZ_ACCESS_REQUEST;
|
||||
+typedef struct _AUTHZ_ACCESS_REPLY *PAUTHZ_ACCESS_REPLY;
|
||||
+
|
||||
BOOL WINAPI DllMain(HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved)
|
||||
{
|
||||
TRACE("(0x%p, %d, %p)\n", hinstDLL, fdwReason, lpvReserved);
|
||||
@@ -67,3 +77,59 @@ BOOL WINAPI AuthzInstallSecurityEventSource(DWORD dwFlags, LPVOID pRegistration)
|
||||
SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
|
||||
return FALSE;
|
||||
}
|
||||
+
|
||||
+
|
||||
+/***********************************************************************
|
||||
+ * AuthzAccessCheck (AUTHZ.@)
|
||||
+ */
|
||||
+BOOL WINAPI AuthzAccessCheck(DWORD flags, AUTHZ_CLIENT_CONTEXT_HANDLE client_context,
|
||||
+ PAUTHZ_ACCESS_REQUEST request, AUTHZ_AUDIT_EVENT_HANDLE audit_event,
|
||||
+ PSECURITY_DESCRIPTOR security, PSECURITY_DESCRIPTOR *optional_security,
|
||||
+ DWORD optional_security_count, PAUTHZ_ACCESS_REPLY reply,
|
||||
+ PAUTHZ_ACCESS_CHECK_RESULTS_HANDLE access_check_result)
|
||||
+{
|
||||
+ FIXME("(0x%x,%p,%p,%p,%p,%p,0x%x,%p,%p): stub\n", flags, client_context,
|
||||
+ request, audit_event, security, optional_security,
|
||||
+ optional_security_count, reply, access_check_result);
|
||||
+ SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
|
||||
+ return FALSE;
|
||||
+}
|
||||
+
|
||||
+
|
||||
+/***********************************************************************
|
||||
+ * AuthzFreeContext (AUTHZ.@)
|
||||
+ */
|
||||
+BOOL WINAPI AuthzFreeContext(AUTHZ_CLIENT_CONTEXT_HANDLE client_context)
|
||||
+{
|
||||
+ FIXME("(%p): stub\n", client_context);
|
||||
+ SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
|
||||
+ return FALSE;
|
||||
+}
|
||||
+
|
||||
+
|
||||
+/***********************************************************************
|
||||
+ * AuthzInitializeContextFromSid (AUTHZ.@)
|
||||
+ */
|
||||
+BOOL WINAPI AuthzInitializeContextFromSid(DWORD flags, PSID sid,
|
||||
+ AUTHZ_RESOURCE_MANAGER_HANDLE resource_manager, PLARGE_INTEGER expire_time,
|
||||
+ LUID id, PVOID dynamic_group, PAUTHZ_CLIENT_CONTEXT_HANDLE client_context)
|
||||
+{
|
||||
+ FIXME("(0x%x,%p,%p,%p,%08x:%08x,%p,%p): stub\n", flags, sid, resource_manager,
|
||||
+ expire_time, id.HighPart, id.LowPart, dynamic_group, client_context);
|
||||
+ SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
|
||||
+ return FALSE;
|
||||
+}
|
||||
+
|
||||
+
|
||||
+/***********************************************************************
|
||||
+ * AuthzInitializeContextFromToken (AUTHZ.@)
|
||||
+ */
|
||||
+BOOL WINAPI AuthzInitializeContextFromToken(DWORD flags, HANDLE token_handle,
|
||||
+ AUTHZ_RESOURCE_MANAGER_HANDLE resource_manager, PLARGE_INTEGER expire_time,
|
||||
+ LUID id, PVOID dynamic_group, PAUTHZ_CLIENT_CONTEXT_HANDLE client_context)
|
||||
+{
|
||||
+ FIXME("(0x%x,%p,%p,%p,%08x:%08x,%p,%p): stub\n", flags, token_handle, resource_manager,
|
||||
+ expire_time, id.HighPart, id.LowPart, dynamic_group, client_context);
|
||||
+ SetLastError(ERROR_CALL_NOT_IMPLEMENTED);
|
||||
+ return FALSE;
|
||||
+}
|
||||
diff --git a/dlls/authz/authz.spec b/dlls/authz/authz.spec
|
||||
index acf3228..eb9e044 100644
|
||||
--- a/dlls/authz/authz.spec
|
||||
+++ b/dlls/authz/authz.spec
|
||||
@@ -1,16 +1,16 @@
|
||||
-@ stub AuthzAccessCheck
|
||||
+@ stdcall AuthzAccessCheck(long long ptr long ptr ptr long ptr ptr)
|
||||
@ stub AuthzAddSidsToContext
|
||||
@ stub AuthzCachedAccessCheck
|
||||
@ stub AuthzEnumerateSecurityEventSources
|
||||
@ stub AuthzEvaluateSacl
|
||||
@ stub AuthzFreeAuditEvent
|
||||
-@ stub AuthzFreeContext
|
||||
+@ stdcall AuthzFreeContext(long)
|
||||
@ stub AuthzFreeHandle
|
||||
@ stub AuthzFreeResourceManager
|
||||
@ stub AuthzGetInformationFromContext
|
||||
@ stub AuthzInitializeContextFromAuthzContext
|
||||
-@ stub AuthzInitializeContextFromSid
|
||||
-@ stub AuthzInitializeContextFromToken
|
||||
+@ stdcall AuthzInitializeContextFromSid(long ptr long ptr int64 ptr ptr)
|
||||
+@ stdcall AuthzInitializeContextFromToken(long long long ptr int64 ptr ptr)
|
||||
@ stub AuthzInitializeObjectAccessAuditEvent
|
||||
@ stub AuthzInitializeObjectAccessAuditEvent2
|
||||
@ stdcall AuthzInitializeResourceManager(long ptr ptr ptr wstr ptr)
|
||||
--
|
||||
2.5.1
|
||||
|
||||
@ -1 +0,0 @@
|
||||
Fixes: Implement additional stub functions in authz.dll
|
||||
@ -51,7 +51,7 @@ usage()
|
||||
# Get the upstream commit sha
|
||||
upstream_commit()
|
||||
{
|
||||
echo "bd332f53f2d7b618e313572159cd7e70e4efb0fc"
|
||||
echo "6bc0ce26a853b51f11958545bfa5570bdcb1cf01"
|
||||
}
|
||||
|
||||
# Show version information
|
||||
@ -90,7 +90,6 @@ patch_enable_all ()
|
||||
enable_advapi32_SetSecurityInfo="$1"
|
||||
enable_amstream_GetMultiMediaStream="$1"
|
||||
enable_api_ms_win_Stub_DLLs="$1"
|
||||
enable_authz_Stub_Functions="$1"
|
||||
enable_avifil32_AVIFile_Proxies="$1"
|
||||
enable_avifil32_IGetFrame_fnSetFormat="$1"
|
||||
enable_avifile_dll16_AVIStreamGetFrame="$1"
|
||||
@ -435,9 +434,6 @@ patch_enable ()
|
||||
api-ms-win-Stub_DLLs)
|
||||
enable_api_ms_win_Stub_DLLs="$2"
|
||||
;;
|
||||
authz-Stub_Functions)
|
||||
enable_authz_Stub_Functions="$2"
|
||||
;;
|
||||
avifil32-AVIFile_Proxies)
|
||||
enable_avifil32_AVIFile_Proxies="$2"
|
||||
;;
|
||||
@ -2744,18 +2740,6 @@ if test "$enable_api_ms_win_Stub_DLLs" -eq 1; then
|
||||
) >> "$patchlist"
|
||||
fi
|
||||
|
||||
# Patchset authz-Stub_Functions
|
||||
# |
|
||||
# | Modified files:
|
||||
# | * dlls/authz/authz.c, dlls/authz/authz.spec
|
||||
# |
|
||||
if test "$enable_authz_Stub_Functions" -eq 1; then
|
||||
patch_apply authz-Stub_Functions/0001-authz-Added-additional-stub-functions.patch
|
||||
(
|
||||
echo '+ { "Zhenbo Li", "authz: Added additional stub functions.", 1 },';
|
||||
) >> "$patchlist"
|
||||
fi
|
||||
|
||||
# Patchset avifil32-AVIFile_Proxies
|
||||
# |
|
||||
# | This patchset fixes the following Wine bugs:
|
||||
|
||||
@ -1,25 +1,26 @@
|
||||
From a347c9baa86ec4503d51b03c1659d08a7062839a Mon Sep 17 00:00:00 2001
|
||||
From 8ff4dfbdec69e2244204a7157c918ef14cf6afc7 Mon Sep 17 00:00:00 2001
|
||||
From: Sebastian Lackner <sebastian@fds-team.de>
|
||||
Date: Sun, 4 May 2014 00:53:51 +0200
|
||||
Subject: wined3d: Silence repeated wined3d_swapchain_present FIXME.
|
||||
|
||||
---
|
||||
dlls/wined3d/swapchain.c | 9 +++++++--
|
||||
1 file changed, 7 insertions(+), 2 deletions(-)
|
||||
dlls/wined3d/swapchain.c | 8 ++++++--
|
||||
1 file changed, 6 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/dlls/wined3d/swapchain.c b/dlls/wined3d/swapchain.c
|
||||
index 75e6628..10c3911 100644
|
||||
index 7d02375..db93328 100644
|
||||
--- a/dlls/wined3d/swapchain.c
|
||||
+++ b/dlls/wined3d/swapchain.c
|
||||
@@ -136,12 +136,17 @@ HRESULT CDECL wined3d_swapchain_present(struct wined3d_swapchain *swapchain,
|
||||
const RECT *src_rect, const RECT *dst_rect, HWND dst_window_override,
|
||||
const RGNDATA *dirty_region, DWORD flags)
|
||||
@@ -135,14 +135,18 @@ void CDECL wined3d_swapchain_set_window(struct wined3d_swapchain *swapchain, HWN
|
||||
HRESULT CDECL wined3d_swapchain_present(struct wined3d_swapchain *swapchain,
|
||||
const RECT *src_rect, const RECT *dst_rect, HWND dst_window_override, DWORD flags)
|
||||
{
|
||||
+ static DWORD notified_flags = 0;
|
||||
+
|
||||
TRACE("swapchain %p, src_rect %s, dst_rect %s, dst_window_override %p, dirty_region %p, flags %#x.\n",
|
||||
RECT s, d;
|
||||
|
||||
TRACE("swapchain %p, src_rect %s, dst_rect %s, dst_window_override %p, flags %#x.\n",
|
||||
swapchain, wine_dbgstr_rect(src_rect), wine_dbgstr_rect(dst_rect),
|
||||
dst_window_override, dirty_region, flags);
|
||||
dst_window_override, flags);
|
||||
|
||||
- if (flags)
|
||||
- FIXME("Ignoring flags %#x.\n", flags);
|
||||
@ -32,5 +33,5 @@ index 75e6628..10c3911 100644
|
||||
if (!swapchain->back_buffers)
|
||||
{
|
||||
--
|
||||
1.7.9.5
|
||||
2.7.1
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user