Intravision/reactos
1
0
Fork 0
mirror of https://github.com/reactos/reactos.git synced 2025-08-03 13:35:47 +00:00
Code Issues Projects Releases Packages Wiki Activity

[0.4.13][ADVAPI32][PSDK] Selected Backports 2023-07-22

Browse source 
0.4.15-dev-5927-g bfc6a119c5 [ADVAPI32] Do not fail on creating a registry key if the security attributes have an invalid length. (#5230) fixes regression CORE-15471
partially 0.4.15-dev-999-g 889b077b23 [REACTOS] *.spec: Fix some function/parameter types (only the [ADVAPI32] part)
0.4.14-dev-1245-g 8ae8083378 [ADVAPI32][PSDK] CryptReleaseContext(): dwFlags parameter is DWORD, only

also fix a bit of whitespace and missing \n in debugprints

---------

advapi32.dll master GCC8.4.0dbg            671.232
advapi32.dll 0.4.14 GCC4.7.2dbg 602.624 -> 602.624
advapi32.dll 0.4.13 GCC4.7.2dbg 602.112 -> 602.112
advapi32.dll 0.4.12 GCC4.7.2dbg 615.424 -> 615.424
advapi32.dll 0.4.11 GCC4.7.2dbg 613.888 -> 613.888
advapi32.dll 0.4.10 GCC4.7.2dbg 604.672 -> 604.672
advapi32.dll 0.4.9  GCC4.7.2dbg 607.744 -> 604.672
advapi32.dll 0.4.8  GCC4.7.2dbg 602.624 -> 589.824
advapi32.dll 0.4.7  GCC4.7.2dbg 601.600 -> 589.312
This commit is contained in:
Joachim Henze 2023-07-22 19:44:00 +02:00
parent b57286aa6c
commit 88da276c6a
10 changed files with 19 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

4
dll/win32/advapi32/advapi32.spec
View file

@ -631,8 +631,8 @@
631 stdcall SystemFunction041(ptr long long) # RtlDecryptMemory
632 stdcall TraceEvent(double ptr) ntdll.EtwTraceEvent
633 stdcall TraceEventInstance(double ptr ptr ptr) ntdll.EtwTraceEventInstance
634 varargs TraceMessage(ptr long ptr long) ntdll.EtwTraceMessage
635 stdcall TraceMessageVa(double long ptr long ptr) ntdll.EtwTraceMessageVa
634 varargs TraceMessage() ntdll.EtwTraceMessage
635 stdcall TraceMessageVa() ntdll.EtwTraceMessageVa
636 stdcall TreeResetNamedSecurityInfoA(str ptr ptr ptr ptr ptr ptr long ptr ptr ptr)
637 stdcall TreeResetNamedSecurityInfoW(wstr long long ptr ptr ptr ptr long ptr long ptr)
638 stub TrusteeAccessToObjectA

6
dll/win32/advapi32/misc/hwprofiles.c
View file

@ -161,11 +161,11 @@ GetCurrentHwProfileW(LPHW_PROFILE_INFOW lpHwProfileInfo)
swprintf(
lpHwProfileInfo->szHwProfileGuid,
L"{%08X-%04X-%04X-%02X%02X-%02X%02X%02X%02X%02X%02X}",
uuid.Data1,
uuid.Data2,
uuid.Data1,
uuid.Data2,
uuid.Data3,
uuid.Data4[0], uuid.Data4[1],
uuid.Data4[2], uuid.Data4[3], uuid.Data4[4], uuid.Data4[5],
uuid.Data4[2], uuid.Data4[3], uuid.Data4[4], uuid.Data4[5],
uuid.Data4[6], uuid.Data4[7]);
dwLength = (wcslen(lpHwProfileInfo->szHwProfileGuid) + 1) * sizeof(WCHAR);

2
dll/win32/advapi32/reg/hkcr.c
View file

@ -39,7 +39,7 @@ GetKeyName(HKEY hKey, PUNICODE_STRING KeyName)
NameInformation = RtlAllocateHeap(RtlGetProcessHeap(), 0, InfoLength);
if (NameInformation == NULL)
{
ERR("Failed to allocate %lu bytes", InfoLength);
ERR("Failed to alloc %lu bytes\n", InfoLength);
return ERROR_NOT_ENOUGH_MEMORY;
}

3
dll/win32/advapi32/reg/reg.c
View file

@ -1108,9 +1108,6 @@ RegCreateKeyExW(
TRACE("RegCreateKeyExW() called\n");
if (lpSecurityAttributes && lpSecurityAttributes->nLength != sizeof(SECURITY_ATTRIBUTES))
return ERROR_INVALID_USER_BUFFER;
/* get the real parent key */
Status = MapDefaultKey(&ParentKey,
hKey);

2
dll/win32/advapi32/sec/misc.c
View file

@ -98,7 +98,7 @@ CheckNtMartaPresent(VOID)
#if DBG
else
{
ERR("Failed to initialize ntmarta.dll! Error: 0x%x", ErrorCode);
ERR("Failed to init ntmarta.dll! Error: 0x%x\n", ErrorCode);
}
#endif
}

2
dll/win32/advapi32/sec/sec.c
View file

@ -240,7 +240,7 @@ SetSecurityDescriptorControl(PSECURITY_DESCRIPTOR pSecurityDescriptor,
SECURITY_DESCRIPTOR_CONTROL ControlBitsToSet)
{
NTSTATUS Status;
Status = RtlSetControlSecurityDescriptor(pSecurityDescriptor,
ControlBitsOfInterest,
ControlBitsToSet);

2
dll/win32/advapi32/service/sctrl.c
View file

@ -669,7 +669,7 @@ ScServiceDispatcher(HANDLE hPipe,
break;
default:
TRACE("Command %lu received", ControlPacket->dwControl);
TRACE("Cmd %lu received\n", ControlPacket->dwControl);
dwError = ScControlService(lpService, ControlPacket);
break;
}

14
dll/win32/advapi32/wine/crypt.c
View file

@ -604,7 +604,7 @@ BOOL WINAPI CryptAcquireContextA (HCRYPTPROV *phProv, LPCSTR pszContainer,
* PARAMS
* hProv [I] Handle to the CSP whose reference is being incremented.
* pdwReserved [IN] Reserved for future use and must be NULL.
* dwFlags [I] Reserved for future use and must be NULL.
* dwFlags [I] Reserved for future use and must be 0.
*
* RETURNS
* Success: TRUE
@ -639,22 +639,18 @@ BOOL WINAPI CryptContextAddRef (HCRYPTPROV hProv, DWORD *pdwReserved, DWORD dwFl
*
* PARAMS
* hProv [I] Handle of a CSP.
* dwFlags [I] Reserved for future use and must be NULL.
* dwFlags [I] Reserved for future use and must be 0.
*
* RETURNS
* Success: TRUE
* Failure: FALSE
*/
#ifdef __REACTOS__
BOOL WINAPI CryptReleaseContext (HCRYPTPROV hProv, DWORD dwFlags)
#else
BOOL WINAPI CryptReleaseContext (HCRYPTPROV hProv, ULONG_PTR dwFlags)
#endif
{
PCRYPTPROV pProv = (PCRYPTPROV)hProv;
BOOL ret = TRUE;
TRACE("(0x%lx, %08lx)\n", hProv, dwFlags);
TRACE("(0x%lx, %08x)\n", hProv, dwFlags);
if (!pProv)
{
@ -732,7 +728,7 @@ BOOL WINAPI CryptGenRandom (HCRYPTPROV hProv, DWORD dwLen, BYTE *pbBuffer)
* hProv [I] Handle of a CSP.
* Algid [I] Identifies the hash algorithm to use.
* hKey [I] Key for the hash (if required).
* dwFlags [I] Reserved for future use and must be NULL.
* dwFlags [I] Reserved for future use and must be 0.
* phHash [O] Address of the future handle to the new hash object.
*
* RETURNS
@ -967,7 +963,7 @@ BOOL WINAPI CryptDestroyKey (HCRYPTKEY hKey)
*
* PARAMS
* hHash [I] Handle to the hash to be copied.
* pdwReserved [I] Reserved for future use and must be zero.
* pdwReserved [I] Reserved for future use and must be NULL.
* dwFlags [I] Reserved for future use and must be zero.
* phHash [O] Address of the handle to receive the copy.
*

13
dll/win32/advapi32/wine/ros_diff.patch
View file

@ -1,13 +0,0 @@
Index: crypt.c
===================================================================
--- crypt.c (Revision 48087)
+++ crypt.c (Arbeitskopie)
@@ -618,7 +618,7 @@
* Success: TRUE
* Failure: FALSE
*/
-BOOL WINAPI CryptReleaseContext (HCRYPTPROV hProv, ULONG_PTR dwFlags)
+BOOL WINAPI CryptReleaseContext (HCRYPTPROV hProv, DWORD dwFlags)
{
PCRYPTPROV pProv = (PCRYPTPROV)hProv;
BOOL ret = TRUE;

14
sdk/include/psdk/wincrypt.h
View file

@ -97,7 +97,7 @@ typedef struct _HMAC_INFO {
BYTE* pbOuterString;
DWORD cbOuterString;
} HMAC_INFO, *PHMAC_INFO;
typedef struct _CRYPTOAPI_BLOB {
DWORD cbData;
BYTE* pbData;
@ -2192,7 +2192,7 @@ static const WCHAR MS_ENH_RSA_AES_PROV_XP_W[] = { 'M','i','c','r','o','s','o','f
#define CRYPT_MODE_OFB 3
#define CRYPT_MODE_CFB 4
#define CRYPT_ENCRYPT 0x0001
#define CRYPT_ENCRYPT 0x0001
#define CRYPT_DECRYPT 0x0002
#define CRYPT_EXPORT 0x0004
#define CRYPT_READ 0x0008
@ -2353,10 +2353,10 @@ static const WCHAR MS_ENH_RSA_AES_PROV_XP_W[] = { 'M','i','c','r','o','s','o','f
#define CERT_GROUP_POLICY_SYSTEM_STORE_REGPATH \
L"Software\\Policies\\Microsoft\\SystemCertificates"
#else
static const WCHAR CERT_LOCAL_MACHINE_SYSTEM_STORE_REGPATH[] =
static const WCHAR CERT_LOCAL_MACHINE_SYSTEM_STORE_REGPATH[] =
{'S','o','f','t','w','a','r','e','\\','M','i','c','r','o','s','o','f','t','\\',
'S','y','s','t','e','m','C','e','r','t','i','f','i','c','a','t','e','s',0 };
static const WCHAR CERT_GROUP_POLICY_SYSTEM_STORE_REGPATH[] =
static const WCHAR CERT_GROUP_POLICY_SYSTEM_STORE_REGPATH[] =
{'S','o','f','t','w','a','r','e','\\','P','o','l','i','c','i','e','s','\\',
'M','i','c','r','o','s','o','f','t','\\','S','y','s','t','e','m','C','e','r',
't','i','f','i','c','a','t','e','s',0 };
@ -2618,7 +2618,7 @@ static const WCHAR CRYPT_OID_REG_FLAGS_VALUE_NAME[] =
# define CERT_PHYSICAL_STORE_AUTH_ROOT_NAME \
L".AuthRoot"
#else
static const WCHAR CERT_PHYSICAL_STORE_DEFAULT_NAME[] =
static const WCHAR CERT_PHYSICAL_STORE_DEFAULT_NAME[] =
{'.','D','e','f','a','u','l','t','0'};
static const WCHAR CERT_PHYSICAL_STORE_GROUP_POLICY_NAME[] =
{'.','G','r','o','u','p','P','o','l','i','c','y',0};
@ -4395,11 +4395,7 @@ CryptImportKey(
_In_ DWORD dwFlags,
_Out_ HCRYPTKEY *phKey);
#if (NTDDI_VERSION >= NTDDI_WINXP)
WINADVAPI BOOL WINAPI CryptReleaseContext(_In_ HCRYPTPROV, _In_ DWORD);
#else
WINADVAPI BOOL WINAPI CryptReleaseContext(_In_ HCRYPTPROV, _In_ ULONG_PTR);
#endif
WINADVAPI
BOOL