mirror of
https://gitlab.winehq.org/wine/wine-staging.git
synced 2025-01-28 22:04:43 -08:00
Rebase against 4f3acf31deef5893b057778695fa5691ccac32df.
This commit is contained in:
Sebastian Lackner
parent
3352a782c9
commit
f644b88d3e
@ -182,7 +182,7 @@ for more details.*
|
||||
* Implement IDXGIOutput::GetDesc
|
||||
* Implement a Microsoft Yahei replacement font ([Wine Bug #13829](https://bugs.winehq.org/show_bug.cgi?id=13829))
|
||||
* Implement additional stubs for vcomp dlls ([Wine Bug #31640](https://bugs.winehq.org/show_bug.cgi?id=31640))
|
||||
* Implement advapi32.GetWindowsAccountDomainSid ([Wine Bug #38624](https://bugs.winehq.org/show_bug.cgi?id=38624))
|
||||
* ~~Implement advapi32.GetWindowsAccountDomainSid~~ ([Wine Bug #38624](https://bugs.winehq.org/show_bug.cgi?id=38624))
|
||||
* Implement an Arial replacement font ([Wine Bug #32323](https://bugs.winehq.org/show_bug.cgi?id=32323))
|
||||
* Implement combase.WindowsSubstring function
|
||||
* Implement default homepage button in inetcpl.cpl
|
||||
|
||||
1
debian/changelog
vendored
1
debian/changelog
vendored
@ -26,6 +26,7 @@ wine-staging (1.7.46) UNRELEASED; urgency=low
|
||||
* Removed patch to fix possible use-after-free in wineserver device IPR code
|
||||
(accepted upstream).
|
||||
* Removed patches to implement GetVolumePathName (accepted upstream).
|
||||
* Removed patch for advapi32.GetWindowsAccountDomainSid (accepted upstream).
|
||||
* Removed patch to fix linking against libunwind on Linux (fixed upstream).
|
||||
-- Sebastian Lackner <sebastian@fds-team.de> Sun, 14 Jun 2015 09:15:50 +0200
|
||||
|
||||
|
||||
@ -1,26 +0,0 @@
|
||||
From 57b1a192499c100392b5102872f685104951300a Mon Sep 17 00:00:00 2001
|
||||
From: Sebastian Lackner <sebastian@fds-team.de>
|
||||
Date: Mon, 22 Jun 2015 03:02:52 +0200
|
||||
Subject: advapi32/tests: Explicitly check return value of GetTokenInformation.
|
||||
|
||||
---
|
||||
dlls/advapi32/tests/security.c | 3 ++-
|
||||
1 file changed, 2 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c
|
||||
index f141b3e..0cb4d7f 100644
|
||||
--- a/dlls/advapi32/tests/security.c
|
||||
+++ b/dlls/advapi32/tests/security.c
|
||||
@@ -4290,7 +4290,8 @@ static void test_GetSecurityInfo(void)
|
||||
win_skip("Failed to get current user token\n");
|
||||
return;
|
||||
}
|
||||
- GetTokenInformation(token, TokenUser, b, l, &l);
|
||||
+ bret = GetTokenInformation(token, TokenUser, b, l, &l);
|
||||
+ ok(bret, "GetTokenInformation(TokenUser) failed with error %d\n", GetLastError());
|
||||
CloseHandle( token );
|
||||
user_sid = ((TOKEN_USER *)b)->User.Sid;
|
||||
|
||||
--
|
||||
2.4.3
|
||||
|
||||
@ -1,128 +0,0 @@
|
||||
From d43d3c07cbe0b1d00e99b8f19b69e44036345bd3 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
|
||||
Date: Mon, 22 Jun 2015 03:13:27 +0200
|
||||
Subject: advapi32/tests: Add tests for GetWindowsAccountDomainSid.
|
||||
|
||||
---
|
||||
dlls/advapi32/tests/security.c | 84 ++++++++++++++++++++++++++++++++++++++++++
|
||||
1 file changed, 84 insertions(+)
|
||||
|
||||
diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c
|
||||
index 0cb4d7f..6e37237 100644
|
||||
--- a/dlls/advapi32/tests/security.c
|
||||
+++ b/dlls/advapi32/tests/security.c
|
||||
@@ -129,6 +129,7 @@ static NTSTATUS (WINAPI *pNtSetSecurityObject)(HANDLE,SECURITY_INFORMATION,PSECU
|
||||
static NTSTATUS (WINAPI *pNtCreateFile)(PHANDLE,ACCESS_MASK,POBJECT_ATTRIBUTES,PIO_STATUS_BLOCK,PLARGE_INTEGER,ULONG,ULONG,ULONG,ULONG,PVOID,ULONG);
|
||||
static BOOL (WINAPI *pRtlDosPathNameToNtPathName_U)(LPCWSTR,PUNICODE_STRING,PWSTR*,CURDIR*);
|
||||
static NTSTATUS (WINAPI *pRtlAnsiStringToUnicodeString)(PUNICODE_STRING,PCANSI_STRING,BOOLEAN);
|
||||
+static BOOL (WINAPI *pGetWindowsAccountDomainSid)(PSID,PSID,DWORD*);
|
||||
|
||||
static HMODULE hmod;
|
||||
static int myARGC;
|
||||
@@ -190,6 +191,7 @@ static void init(void)
|
||||
pConvertStringSidToSidA = (void *)GetProcAddress(hmod, "ConvertStringSidToSidA");
|
||||
pGetAclInformation = (void *)GetProcAddress(hmod, "GetAclInformation");
|
||||
pGetAce = (void *)GetProcAddress(hmod, "GetAce");
|
||||
+ pGetWindowsAccountDomainSid = (void *)GetProcAddress(hmod, "GetWindowsAccountDomainSid");
|
||||
|
||||
myARGC = winetest_get_mainargs( &myARGV );
|
||||
}
|
||||
@@ -5922,6 +5924,87 @@ static void test_system_security_access(void)
|
||||
CloseHandle( token );
|
||||
}
|
||||
|
||||
+static void test_GetWindowsAccountDomainSid(void)
|
||||
+{
|
||||
+ char *user, buffer1[SECURITY_MAX_SID_SIZE], buffer2[SECURITY_MAX_SID_SIZE];
|
||||
+ SID_IDENTIFIER_AUTHORITY domain_ident = {{0,0,0,0,0,5}};
|
||||
+ PSID domain_sid = (PSID *)&buffer1;
|
||||
+ PSID domain_sid2 = (PSID *)&buffer2;
|
||||
+ DWORD sid_size;
|
||||
+ PSID user_sid;
|
||||
+ HANDLE token;
|
||||
+ BOOL bret = TRUE;
|
||||
+ int i;
|
||||
+
|
||||
+ if (!pGetWindowsAccountDomainSid)
|
||||
+ {
|
||||
+ skip("GetWindowsAccountDomainSid not available\n");
|
||||
+ return;
|
||||
+ }
|
||||
+
|
||||
+ if (!OpenThreadToken(GetCurrentThread(), TOKEN_READ, TRUE, &token))
|
||||
+ {
|
||||
+ if (GetLastError() != ERROR_NO_TOKEN) bret = FALSE;
|
||||
+ else if (!OpenProcessToken(GetCurrentProcess(), TOKEN_READ, &token)) bret = FALSE;
|
||||
+ }
|
||||
+ if (!bret)
|
||||
+ {
|
||||
+ win_skip("Failed to get current user token\n");
|
||||
+ return;
|
||||
+ }
|
||||
+
|
||||
+ bret = GetTokenInformation(token, TokenUser, NULL, 0, &sid_size);
|
||||
+ ok(!bret && GetLastError() == ERROR_INSUFFICIENT_BUFFER,
|
||||
+ "GetTokenInformation(TokenUser) failed with error %d\n", GetLastError());
|
||||
+ user = HeapAlloc(GetProcessHeap(), 0, sid_size);
|
||||
+ bret = GetTokenInformation(token, TokenUser, user, sid_size, &sid_size);
|
||||
+ ok(bret, "GetTokenInformation(TokenUser) failed with error %d\n", GetLastError());
|
||||
+ CloseHandle(token);
|
||||
+ user_sid = ((TOKEN_USER *)user)->User.Sid;
|
||||
+
|
||||
+ SetLastError(0xdeadbeef);
|
||||
+ bret = pGetWindowsAccountDomainSid(0, 0, 0);
|
||||
+ ok(!bret, "GetWindowsAccountDomainSid succeeded\n");
|
||||
+ ok(GetLastError() == ERROR_INVALID_SID, "expected ERROR_INVALID_SID, got %d\n", GetLastError());
|
||||
+
|
||||
+ SetLastError(0xdeadbeef);
|
||||
+ bret = pGetWindowsAccountDomainSid(user_sid, 0, 0);
|
||||
+ ok(!bret, "GetWindowsAccountDomainSid succeeded\n");
|
||||
+ ok(GetLastError() == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError());
|
||||
+
|
||||
+ sid_size = SECURITY_MAX_SID_SIZE;
|
||||
+ SetLastError(0xdeadbeef);
|
||||
+ bret = pGetWindowsAccountDomainSid(user_sid, 0, &sid_size);
|
||||
+ ok(!bret, "GetWindowsAccountDomainSid succeeded\n");
|
||||
+ ok(GetLastError() == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError());
|
||||
+ ok(sid_size == GetSidLengthRequired(4), "expected size %d, got %d\n", GetSidLengthRequired(4), sid_size);
|
||||
+
|
||||
+ SetLastError(0xdeadbeef);
|
||||
+ bret = pGetWindowsAccountDomainSid(user_sid, domain_sid, 0);
|
||||
+ ok(!bret, "GetWindowsAccountDomainSid succeeded\n");
|
||||
+ ok(GetLastError() == ERROR_INVALID_PARAMETER, "expected ERROR_INVALID_PARAMETER, got %d\n", GetLastError());
|
||||
+
|
||||
+ sid_size = 1;
|
||||
+ SetLastError(0xdeadbeef);
|
||||
+ bret = pGetWindowsAccountDomainSid(user_sid, domain_sid, &sid_size);
|
||||
+ ok(!bret, "GetWindowsAccountDomainSid succeeded\n");
|
||||
+ ok(GetLastError() == ERROR_INSUFFICIENT_BUFFER, "expected ERROR_INSUFFICIENT_BUFFER, got %d\n", GetLastError());
|
||||
+ ok(sid_size == GetSidLengthRequired(4), "expected size %d, got %d\n", GetSidLengthRequired(4), sid_size);
|
||||
+
|
||||
+ SetLastError(0xdeadbeef);
|
||||
+ sid_size = SECURITY_MAX_SID_SIZE;
|
||||
+ bret = pGetWindowsAccountDomainSid(user_sid, domain_sid, &sid_size);
|
||||
+ ok(bret, "GetWindowsAccountDomainSid failed with error %d\n", GetLastError());
|
||||
+ todo_wine ok(GetLastError() == 0xdeadbeef, "last error should not change\n");
|
||||
+ ok(sid_size == GetSidLengthRequired(4), "expected size %d, got %d\n", GetSidLengthRequired(4), sid_size);
|
||||
+ InitializeSid(domain_sid2, &domain_ident, 4);
|
||||
+ for (i = 0; i < 4; i++)
|
||||
+ *GetSidSubAuthority(domain_sid2, i) = *GetSidSubAuthority(user_sid, i);
|
||||
+ ok(EqualSid(domain_sid, domain_sid2), "unexpected domain sid\n");
|
||||
+
|
||||
+ HeapFree(GetProcessHeap(), 0, user);
|
||||
+}
|
||||
+
|
||||
START_TEST(security)
|
||||
{
|
||||
init();
|
||||
@@ -5953,6 +6036,7 @@ START_TEST(security)
|
||||
test_ConvertSecurityDescriptorToString();
|
||||
test_PrivateObjectSecurity();
|
||||
test_acls();
|
||||
+ test_GetWindowsAccountDomainSid();
|
||||
test_GetSecurityInfo();
|
||||
test_GetSidSubAuthority();
|
||||
test_CheckTokenMembership();
|
||||
--
|
||||
2.4.3
|
||||
|
||||
@ -1,125 +0,0 @@
|
||||
From d77803caf6c07cccf8e21cf065b1cc1d4d328481 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
|
||||
Date: Mon, 22 Jun 2015 03:18:53 +0200
|
||||
Subject: advapi32: Add initial implementation for GetWindowsAccountDomainSid.
|
||||
|
||||
---
|
||||
dlls/advapi32/advapi32.spec | 2 +-
|
||||
dlls/advapi32/security.c | 46 ++++++++++++++++++++++
|
||||
dlls/advapi32/tests/security.c | 2 +-
|
||||
.../api-ms-win-security-base-l1-1-0.spec | 2 +-
|
||||
.../api-ms-win-security-base-l1-2-0.spec | 2 +-
|
||||
5 files changed, 50 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/dlls/advapi32/advapi32.spec b/dlls/advapi32/advapi32.spec
|
||||
index 4600142..ec27440 100644
|
||||
--- a/dlls/advapi32/advapi32.spec
|
||||
+++ b/dlls/advapi32/advapi32.spec
|
||||
@@ -363,7 +363,7 @@
|
||||
@ stdcall GetTrusteeTypeW(ptr)
|
||||
@ stdcall GetUserNameA(ptr ptr)
|
||||
@ stdcall GetUserNameW(ptr ptr)
|
||||
-# @ stub GetWindowsAccountDomainSid
|
||||
+@ stdcall GetWindowsAccountDomainSid(ptr ptr ptr)
|
||||
# @ stub I_QueryTagInformation
|
||||
# @ stub I_ScGetCurrentGroupStateW
|
||||
# @ stub I_ScIsSecurityProcess
|
||||
diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c
|
||||
index 028dcc6..07985d4 100644
|
||||
--- a/dlls/advapi32/security.c
|
||||
+++ b/dlls/advapi32/security.c
|
||||
@@ -1538,6 +1538,52 @@ BOOL WINAPI SetSecurityDescriptorControl( PSECURITY_DESCRIPTOR pSecurityDescript
|
||||
pSecurityDescriptor, ControlBitsOfInterest, ControlBitsToSet ) );
|
||||
}
|
||||
|
||||
+/******************************************************************************
|
||||
+ * GetWindowsAccountDomainSid [ADVAPI32.@]
|
||||
+ */
|
||||
+BOOL WINAPI GetWindowsAccountDomainSid( PSID sid, PSID domain_sid, DWORD *size )
|
||||
+{
|
||||
+ SID_IDENTIFIER_AUTHORITY domain_ident = {{0,0,0,0,0,5}};
|
||||
+ DWORD required_size;
|
||||
+ int i;
|
||||
+
|
||||
+ FIXME( "(%p %p %p): semi-stub\n", sid, domain_sid, size );
|
||||
+
|
||||
+ if (!sid || !IsValidSid( sid ))
|
||||
+ {
|
||||
+ SetLastError( ERROR_INVALID_SID );
|
||||
+ return FALSE;
|
||||
+ }
|
||||
+
|
||||
+ if (!size)
|
||||
+ {
|
||||
+ SetLastError( ERROR_INVALID_PARAMETER );
|
||||
+ return FALSE;
|
||||
+ }
|
||||
+
|
||||
+ if (*GetSidSubAuthorityCount( sid ) < 4)
|
||||
+ {
|
||||
+ SetLastError( ERROR_INVALID_SID );
|
||||
+ return FALSE;
|
||||
+ }
|
||||
+
|
||||
+ required_size = GetSidLengthRequired( 4 );
|
||||
+ if (*size < required_size || !domain_sid)
|
||||
+ {
|
||||
+ *size = required_size;
|
||||
+ SetLastError( domain_sid ? ERROR_INSUFFICIENT_BUFFER :
|
||||
+ ERROR_INVALID_PARAMETER );
|
||||
+ return FALSE;
|
||||
+ }
|
||||
+
|
||||
+ InitializeSid( domain_sid, &domain_ident, 4 );
|
||||
+ for (i = 0; i < 4; i++)
|
||||
+ *GetSidSubAuthority( domain_sid, i ) = *GetSidSubAuthority( sid, i );
|
||||
+
|
||||
+ *size = required_size;
|
||||
+ return TRUE;
|
||||
+}
|
||||
+
|
||||
/* ##############################
|
||||
###### ACL FUNCTIONS ######
|
||||
##############################
|
||||
diff --git a/dlls/advapi32/tests/security.c b/dlls/advapi32/tests/security.c
|
||||
index 6e37237..93f18e5 100644
|
||||
--- a/dlls/advapi32/tests/security.c
|
||||
+++ b/dlls/advapi32/tests/security.c
|
||||
@@ -5938,7 +5938,7 @@ static void test_GetWindowsAccountDomainSid(void)
|
||||
|
||||
if (!pGetWindowsAccountDomainSid)
|
||||
{
|
||||
- skip("GetWindowsAccountDomainSid not available\n");
|
||||
+ win_skip("GetWindowsAccountDomainSid not available\n");
|
||||
return;
|
||||
}
|
||||
|
||||
diff --git a/dlls/api-ms-win-security-base-l1-1-0/api-ms-win-security-base-l1-1-0.spec b/dlls/api-ms-win-security-base-l1-1-0/api-ms-win-security-base-l1-1-0.spec
|
||||
index 4277706..edae6d1 100644
|
||||
--- a/dlls/api-ms-win-security-base-l1-1-0/api-ms-win-security-base-l1-1-0.spec
|
||||
+++ b/dlls/api-ms-win-security-base-l1-1-0/api-ms-win-security-base-l1-1-0.spec
|
||||
@@ -57,7 +57,7 @@
|
||||
@ stdcall GetSidSubAuthority(ptr long) advapi32.GetSidSubAuthority
|
||||
@ stdcall GetSidSubAuthorityCount(ptr) advapi32.GetSidSubAuthorityCount
|
||||
@ stdcall GetTokenInformation(long long ptr long ptr) advapi32.GetTokenInformation
|
||||
-@ stub GetWindowsAccountDomainSid
|
||||
+@ stdcall GetWindowsAccountDomainSid(ptr ptr ptr) advapi32.GetWindowsAccountDomainSid
|
||||
@ stdcall ImpersonateAnonymousToken(long) advapi32.ImpersonateAnonymousToken
|
||||
@ stdcall ImpersonateLoggedOnUser(long) advapi32.ImpersonateLoggedOnUser
|
||||
@ stdcall ImpersonateSelf(long) advapi32.ImpersonateSelf
|
||||
diff --git a/dlls/api-ms-win-security-base-l1-2-0/api-ms-win-security-base-l1-2-0.spec b/dlls/api-ms-win-security-base-l1-2-0/api-ms-win-security-base-l1-2-0.spec
|
||||
index 3adef23..e19fe53 100644
|
||||
--- a/dlls/api-ms-win-security-base-l1-2-0/api-ms-win-security-base-l1-2-0.spec
|
||||
+++ b/dlls/api-ms-win-security-base-l1-2-0/api-ms-win-security-base-l1-2-0.spec
|
||||
@@ -63,7 +63,7 @@
|
||||
@ stdcall GetSidSubAuthority(ptr long) advapi32.GetSidSubAuthority
|
||||
@ stdcall GetSidSubAuthorityCount(ptr) advapi32.GetSidSubAuthorityCount
|
||||
@ stdcall GetTokenInformation(long long ptr long ptr) advapi32.GetTokenInformation
|
||||
-@ stub GetWindowsAccountDomainSid
|
||||
+@ stdcall GetWindowsAccountDomainSid(ptr ptr ptr) advapi32.GetWindowsAccountDomainSid
|
||||
@ stdcall ImpersonateAnonymousToken(long) advapi32.ImpersonateAnonymousToken
|
||||
@ stdcall ImpersonateLoggedOnUser(long) advapi32.ImpersonateLoggedOnUser
|
||||
@ stdcall ImpersonateSelf(long) advapi32.ImpersonateSelf
|
||||
--
|
||||
2.4.3
|
||||
|
||||
@ -1 +0,0 @@
|
||||
Fixes: [38624] Implement advapi32.GetWindowsAccountDomainSid
|
||||
@ -1,43 +0,0 @@
|
||||
From 6ca0ad01766c2b20a9d4be0529a43f37c3a0aa4b Mon Sep 17 00:00:00 2001
|
||||
From: Sebastian Lackner <sebastian@fds-team.de>
|
||||
Date: Sun, 21 Jun 2015 08:51:45 +0200
|
||||
Subject: ntoskrnl: Use ULONGLONG to store offset to USER_SHARED_DATA page.
|
||||
|
||||
---
|
||||
dlls/ntoskrnl.exe/instr.c | 6 +++---
|
||||
1 file changed, 3 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/dlls/ntoskrnl.exe/instr.c b/dlls/ntoskrnl.exe/instr.c
|
||||
index 1306d5f..1a22f4c 100644
|
||||
--- a/dlls/ntoskrnl.exe/instr.c
|
||||
+++ b/dlls/ntoskrnl.exe/instr.c
|
||||
@@ -684,7 +684,7 @@ static DWORD emulate_instruction( EXCEPTION_RECORD *rec, CONTEXT *context )
|
||||
BYTE *data = INSTR_GetOperandAddr( context, instr + 2, long_addr,
|
||||
rex, segprefix, &len );
|
||||
unsigned int data_size = (instr[1] == 0xb7) ? 2 : 1;
|
||||
- unsigned int offset = data - user_shared_data;
|
||||
+ ULONGLONG offset = data - user_shared_data;
|
||||
|
||||
if (offset <= sizeof(KSHARED_USER_DATA) - data_size)
|
||||
{
|
||||
@@ -705,7 +705,7 @@ static DWORD emulate_instruction( EXCEPTION_RECORD *rec, CONTEXT *context )
|
||||
BYTE *data = INSTR_GetOperandAddr( context, instr + 1, long_addr,
|
||||
rex, segprefix, &len );
|
||||
unsigned int data_size = (*instr == 0x8b) ? get_op_size( long_op, rex ) : 1;
|
||||
- unsigned int offset = data - user_shared_data;
|
||||
+ ULONGLONG offset = data - user_shared_data;
|
||||
|
||||
if (offset <= sizeof(KSHARED_USER_DATA) - data_size)
|
||||
{
|
||||
@@ -725,7 +725,7 @@ static DWORD emulate_instruction( EXCEPTION_RECORD *rec, CONTEXT *context )
|
||||
{
|
||||
BYTE *data = (BYTE *)(long_addr ? *(DWORD64 *)(instr + 1) : *(DWORD *)(instr + 1));
|
||||
unsigned int data_size = (*instr == 0xa1) ? get_op_size( long_op, rex ) : 1;
|
||||
- unsigned int offset = data - user_shared_data;
|
||||
+ ULONGLONG offset = data - user_shared_data;
|
||||
len = long_addr ? sizeof(DWORD64) : sizeof(DWORD);
|
||||
|
||||
if (offset <= sizeof(KSHARED_USER_DATA) - data_size)
|
||||
--
|
||||
2.4.3
|
||||
|
||||
@ -55,7 +55,7 @@ version()
|
||||
echo "Copyright (C) 2014-2015 the Wine Staging project authors."
|
||||
echo ""
|
||||
echo "Patchset to be applied on upstream Wine:"
|
||||
echo " commit da5151fd54c2679b9cd10a7a4d2933f727266bf5"
|
||||
echo " commit 4f3acf31deef5893b057778695fa5691ccac32df"
|
||||
echo ""
|
||||
}
|
||||
|
||||
@ -80,7 +80,6 @@ patch_enable_all ()
|
||||
enable_Exagear="$1"
|
||||
enable_Pipelight="$1"
|
||||
enable_Staging="$1"
|
||||
enable_advapi32_GetWindowsAccountDomainSid="$1"
|
||||
enable_advapi32_LsaLookupSids="$1"
|
||||
enable_browseui_Progress_Dialog="$1"
|
||||
enable_combase_String="$1"
|
||||
@ -185,7 +184,6 @@ patch_enable_all ()
|
||||
enable_ntdll_WinSqm="$1"
|
||||
enable_ntdll_WriteWatches="$1"
|
||||
enable_ntoskrnl_DriverTest="$1"
|
||||
enable_ntoskrnl_Fix_Type="$1"
|
||||
enable_ntoskrnl_Stubs="$1"
|
||||
enable_nvapi_Stub_DLL="$1"
|
||||
enable_nvcuda_CUDA_Support="$1"
|
||||
@ -315,9 +313,6 @@ patch_enable ()
|
||||
Staging)
|
||||
enable_Staging="$2"
|
||||
;;
|
||||
advapi32-GetWindowsAccountDomainSid)
|
||||
enable_advapi32_GetWindowsAccountDomainSid="$2"
|
||||
;;
|
||||
advapi32-LsaLookupSids)
|
||||
enable_advapi32_LsaLookupSids="$2"
|
||||
;;
|
||||
@ -633,9 +628,6 @@ patch_enable ()
|
||||
ntoskrnl-DriverTest)
|
||||
enable_ntoskrnl_DriverTest="$2"
|
||||
;;
|
||||
ntoskrnl-Fix_Type)
|
||||
enable_ntoskrnl_Fix_Type="$2"
|
||||
;;
|
||||
ntoskrnl-Stubs)
|
||||
enable_ntoskrnl_Stubs="$2"
|
||||
;;
|
||||
@ -2020,24 +2012,22 @@ if test "$enable_Staging" -eq 1; then
|
||||
) >> "$patchlist"
|
||||
fi
|
||||
|
||||
# Patchset advapi32-GetWindowsAccountDomainSid
|
||||
# Patchset server-CreateProcess_ACLs
|
||||
# |
|
||||
# | This patchset fixes the following Wine bugs:
|
||||
# | * [#38624] Implement advapi32.GetWindowsAccountDomainSid
|
||||
# | * [#22006] Support for process ACLs
|
||||
# |
|
||||
# | Modified files:
|
||||
# | * dlls/advapi32/advapi32.spec, dlls/advapi32/security.c, dlls/advapi32/tests/security.c, dlls/api-ms-win-security-
|
||||
# | base-l1-1-0/api-ms-win-security-base-l1-1-0.spec, dlls/api-ms-win-security-base-l1-2-0/api-ms-win-security-
|
||||
# | base-l1-2-0.spec
|
||||
# | * dlls/advapi32/tests/security.c, dlls/kernel32/process.c, server/process.c, server/protocol.def
|
||||
# |
|
||||
if test "$enable_advapi32_GetWindowsAccountDomainSid" -eq 1; then
|
||||
patch_apply advapi32-GetWindowsAccountDomainSid/0001-advapi32-tests-Explicitly-check-return-value-of-GetT.patch
|
||||
patch_apply advapi32-GetWindowsAccountDomainSid/0002-advapi32-tests-Add-tests-for-GetWindowsAccountDomain.patch
|
||||
patch_apply advapi32-GetWindowsAccountDomainSid/0003-advapi32-Add-initial-implementation-for-GetWindowsAc.patch
|
||||
if test "$enable_server_CreateProcess_ACLs" -eq 1; then
|
||||
patch_apply server-CreateProcess_ACLs/0001-server-Support-for-thread-and-process-security-descr.patch
|
||||
patch_apply server-CreateProcess_ACLs/0002-kernel32-Implement-passing-security-descriptors-from.patch
|
||||
patch_apply server-CreateProcess_ACLs/0003-advapi32-tests-Add-additional-tests-for-passing-a-th.patch
|
||||
(
|
||||
echo '+ { "Sebastian Lackner", "advapi32/tests: Explicitly check return value of GetTokenInformation.", 1 },';
|
||||
echo '+ { "Michael Müller", "advapi32/tests: Add tests for GetWindowsAccountDomainSid.", 1 },';
|
||||
echo '+ { "Michael Müller", "advapi32: Add initial implementation for GetWindowsAccountDomainSid.", 1 },';
|
||||
echo '+ { "Sebastian Lackner", "server: Support for thread and process security descriptors in new_process wineserver call.", 2 },';
|
||||
echo '+ { "Sebastian Lackner", "kernel32: Implement passing security descriptors from CreateProcess to the wineserver.", 2 },';
|
||||
echo '+ { "Joris van der Wel", "advapi32/tests: Add additional tests for passing a thread sd to CreateProcess.", 1 },';
|
||||
) >> "$patchlist"
|
||||
fi
|
||||
|
||||
@ -2058,25 +2048,6 @@ if test "$enable_server_Misc_ACL" -eq 1; then
|
||||
) >> "$patchlist"
|
||||
fi
|
||||
|
||||
# Patchset server-CreateProcess_ACLs
|
||||
# |
|
||||
# | This patchset fixes the following Wine bugs:
|
||||
# | * [#22006] Support for process ACLs
|
||||
# |
|
||||
# | Modified files:
|
||||
# | * dlls/advapi32/tests/security.c, dlls/kernel32/process.c, server/process.c, server/protocol.def
|
||||
# |
|
||||
if test "$enable_server_CreateProcess_ACLs" -eq 1; then
|
||||
patch_apply server-CreateProcess_ACLs/0001-server-Support-for-thread-and-process-security-descr.patch
|
||||
patch_apply server-CreateProcess_ACLs/0002-kernel32-Implement-passing-security-descriptors-from.patch
|
||||
patch_apply server-CreateProcess_ACLs/0003-advapi32-tests-Add-additional-tests-for-passing-a-th.patch
|
||||
(
|
||||
echo '+ { "Sebastian Lackner", "server: Support for thread and process security descriptors in new_process wineserver call.", 2 },';
|
||||
echo '+ { "Sebastian Lackner", "kernel32: Implement passing security descriptors from CreateProcess to the wineserver.", 2 },';
|
||||
echo '+ { "Joris van der Wel", "advapi32/tests: Add additional tests for passing a thread sd to CreateProcess.", 1 },';
|
||||
) >> "$patchlist"
|
||||
fi
|
||||
|
||||
# Patchset advapi32-LsaLookupSids
|
||||
# |
|
||||
# | Modified files:
|
||||
@ -2933,6 +2904,18 @@ if test "$enable_kernel32_CompareStringEx" -eq 1; then
|
||||
) >> "$patchlist"
|
||||
fi
|
||||
|
||||
# Patchset kernel32-SetFileInformationByHandle
|
||||
# |
|
||||
# | Modified files:
|
||||
# | * include/winbase.h
|
||||
# |
|
||||
if test "$enable_kernel32_SetFileInformationByHandle" -eq 1; then
|
||||
patch_apply kernel32-SetFileInformationByHandle/0001-include-Declare-a-couple-more-file-information-class.patch
|
||||
(
|
||||
echo '+ { "Michael Müller", "include: Declare a couple more file information class structures.", 1 },';
|
||||
) >> "$patchlist"
|
||||
fi
|
||||
|
||||
# Patchset server-File_Permissions
|
||||
# |
|
||||
# | Modified files:
|
||||
@ -2996,18 +2979,6 @@ if test "$enable_ntdll_FileDispositionInformation" -eq 1; then
|
||||
) >> "$patchlist"
|
||||
fi
|
||||
|
||||
# Patchset kernel32-SetFileInformationByHandle
|
||||
# |
|
||||
# | Modified files:
|
||||
# | * include/winbase.h
|
||||
# |
|
||||
if test "$enable_kernel32_SetFileInformationByHandle" -eq 1; then
|
||||
patch_apply kernel32-SetFileInformationByHandle/0001-include-Declare-a-couple-more-file-information-class.patch
|
||||
(
|
||||
echo '+ { "Michael Müller", "include: Declare a couple more file information class structures.", 1 },';
|
||||
) >> "$patchlist"
|
||||
fi
|
||||
|
||||
# Patchset kernel32-CopyFileEx
|
||||
# |
|
||||
# | This patchset fixes the following Wine bugs:
|
||||
@ -3895,18 +3866,6 @@ if test "$enable_ntoskrnl_DriverTest" -eq 1; then
|
||||
) >> "$patchlist"
|
||||
fi
|
||||
|
||||
# Patchset ntoskrnl-Fix_Type
|
||||
# |
|
||||
# | Modified files:
|
||||
# | * dlls/ntoskrnl.exe/instr.c
|
||||
# |
|
||||
if test "$enable_ntoskrnl_Fix_Type" -eq 1; then
|
||||
patch_apply ntoskrnl-Fix_Type/0001-ntoskrnl-Use-ULONGLONG-to-store-offset-to-USER_SHARE.patch
|
||||
(
|
||||
echo '+ { "Sebastian Lackner", "ntoskrnl: Use ULONGLONG to store offset to USER_SHARED_DATA page.", 1 },';
|
||||
) >> "$patchlist"
|
||||
fi
|
||||
|
||||
# Patchset ntoskrnl-Stubs
|
||||
# |
|
||||
# | This patchset fixes the following Wine bugs:
|
||||
@ -5020,30 +4979,6 @@ if test "$enable_wined3d_CSMT_Helper" -eq 1; then
|
||||
) >> "$patchlist"
|
||||
fi
|
||||
|
||||
# Patchset wined3d-resource_check_usage
|
||||
# |
|
||||
# | Modified files:
|
||||
# | * dlls/wined3d/resource.c
|
||||
# |
|
||||
if test "$enable_wined3d_resource_check_usage" -eq 1; then
|
||||
patch_apply wined3d-resource_check_usage/0001-wined3d-Silence-repeated-resource_check_usage-FIXME.patch
|
||||
(
|
||||
echo '+ { "Erich E. Hoover", "wined3d: Silence repeated resource_check_usage FIXME.", 2 },';
|
||||
) >> "$patchlist"
|
||||
fi
|
||||
|
||||
# Patchset wined3d-wined3d_swapchain_present
|
||||
# |
|
||||
# | Modified files:
|
||||
# | * dlls/wined3d/swapchain.c
|
||||
# |
|
||||
if test "$enable_wined3d_wined3d_swapchain_present" -eq 1; then
|
||||
patch_apply wined3d-wined3d_swapchain_present/0001-wined3d-Silence-repeated-wined3d_swapchain_present-F.patch
|
||||
(
|
||||
echo '+ { "Sebastian Lackner", "wined3d: Silence repeated wined3d_swapchain_present FIXME.", 1 },';
|
||||
) >> "$patchlist"
|
||||
fi
|
||||
|
||||
# Patchset wined3d-Multisampling
|
||||
# |
|
||||
# | This patchset fixes the following Wine bugs:
|
||||
@ -5105,6 +5040,30 @@ if test "$enable_wined3d_UnhandledBlendFactor" -eq 1; then
|
||||
) >> "$patchlist"
|
||||
fi
|
||||
|
||||
# Patchset wined3d-resource_check_usage
|
||||
# |
|
||||
# | Modified files:
|
||||
# | * dlls/wined3d/resource.c
|
||||
# |
|
||||
if test "$enable_wined3d_resource_check_usage" -eq 1; then
|
||||
patch_apply wined3d-resource_check_usage/0001-wined3d-Silence-repeated-resource_check_usage-FIXME.patch
|
||||
(
|
||||
echo '+ { "Erich E. Hoover", "wined3d: Silence repeated resource_check_usage FIXME.", 2 },';
|
||||
) >> "$patchlist"
|
||||
fi
|
||||
|
||||
# Patchset wined3d-wined3d_swapchain_present
|
||||
# |
|
||||
# | Modified files:
|
||||
# | * dlls/wined3d/swapchain.c
|
||||
# |
|
||||
if test "$enable_wined3d_wined3d_swapchain_present" -eq 1; then
|
||||
patch_apply wined3d-wined3d_swapchain_present/0001-wined3d-Silence-repeated-wined3d_swapchain_present-F.patch
|
||||
(
|
||||
echo '+ { "Sebastian Lackner", "wined3d: Silence repeated wined3d_swapchain_present FIXME.", 1 },';
|
||||
) >> "$patchlist"
|
||||
fi
|
||||
|
||||
# Patchset wined3d-CSMT_Main
|
||||
# |
|
||||
# | This patchset fixes the following Wine bugs:
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user