Rebase against a1dddd902f21e3a5057a40cb9848351f0cbcfd82.

This commit is contained in:
Alistair Leslie-Hughes
2025-02-09 18:37:05 +11:00
parent 22f5ea5e4f
commit aed0bcfb83
3 changed files with 27 additions and 30 deletions

View File

@@ -1,4 +1,4 @@
From 5a622f291c666fcc1e7f63d4be7e0db886806cb2 Mon Sep 17 00:00:00 2001
From db45e866f5d465e7da2e283e0fa97594fff7d6e8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Sun, 17 Jan 2016 00:50:50 +0100
Subject: [PATCH] ntdll/tests: Add basic tests for RtlQueryPackageIdentity.
@@ -20,7 +20,7 @@ index 3742968c415..084469a2820 100644
SOURCES = \
atom.c \
diff --git a/dlls/ntdll/tests/rtl.c b/dlls/ntdll/tests/rtl.c
index 05a27ec6b2c..16cb8b240ed 100644
index eaee2768c6a..544744dd8e6 100644
--- a/dlls/ntdll/tests/rtl.c
+++ b/dlls/ntdll/tests/rtl.c
@@ -38,6 +38,9 @@
@@ -33,8 +33,8 @@ index 05a27ec6b2c..16cb8b240ed 100644
#ifndef __WINE_WINTERNL_H
@@ -115,6 +118,9 @@ static void (WINAPI *pRtlInitializeGenericTable)(RTL_GENERIC_TABLE *, PRTL_
static void * (WINAPI *pRtlFindExportedRoutineByName)(HMODULE,const char *);
@@ -118,6 +121,9 @@ static void * (WINAPI *pRtlFindExportedRoutineByName)(HMODULE,const char *);
static void * (WINAPI *pRtlLookupElementGenericTable)(PRTL_GENERIC_TABLE, void *);
static ULONG (WINAPI *pRtlNumberGenericTableElements)(PRTL_GENERIC_TABLE);
static NTSTATUS (WINAPI *pLdrEnumerateLoadedModules)(void *, void *, void *);
+static NTSTATUS (WINAPI *pRtlQueryPackageIdentity)(HANDLE, WCHAR*, SIZE_T*, WCHAR*, SIZE_T*, BOOLEAN*);
@@ -43,8 +43,8 @@ index 05a27ec6b2c..16cb8b240ed 100644
static NTSTATUS (WINAPI *pLdrRegisterDllNotification)(ULONG, PLDR_DLL_NOTIFICATION_FUNCTION, void *, void **);
static NTSTATUS (WINAPI *pLdrUnregisterDllNotification)(void *);
static VOID (WINAPI *pRtlGetDeviceFamilyInfoEnum)(ULONGLONG *,DWORD *,DWORD *);
@@ -179,6 +185,9 @@ static void InitFunctionPtrs(void)
pRtlFindExportedRoutineByName = (void *)GetProcAddress(hntdll, "RtlFindExportedRoutineByName");
@@ -185,6 +191,9 @@ static void InitFunctionPtrs(void)
pRtlLookupElementGenericTable = (void *)GetProcAddress(hntdll, "RtlLookupElementGenericTable");
pRtlNumberGenericTableElements = (void *)GetProcAddress(hntdll, "RtlNumberGenericTableElements");
pLdrEnumerateLoadedModules = (void *)GetProcAddress(hntdll, "LdrEnumerateLoadedModules");
+ pRtlQueryPackageIdentity = (void *)GetProcAddress(hntdll, "RtlQueryPackageIdentity");
@@ -53,7 +53,7 @@ index 05a27ec6b2c..16cb8b240ed 100644
pLdrRegisterDllNotification = (void *)GetProcAddress(hntdll, "LdrRegisterDllNotification");
pLdrUnregisterDllNotification = (void *)GetProcAddress(hntdll, "LdrUnregisterDllNotification");
pRtlGetDeviceFamilyInfoEnum = (void *)GetProcAddress(hntdll, "RtlGetDeviceFamilyInfoEnum");
@@ -3750,6 +3759,76 @@ static void test_RtlFirstFreeAce(void)
@@ -3756,6 +3765,76 @@ static void test_RtlFirstFreeAce(void)
HeapFree(GetProcessHeap(), 0, acl);
}
@@ -130,7 +130,7 @@ index 05a27ec6b2c..16cb8b240ed 100644
static void test_RtlInitializeSid(void)
{
SID_IDENTIFIER_AUTHORITY sid_ident = { SECURITY_NT_AUTHORITY };
@@ -4979,6 +5058,7 @@ START_TEST(rtl)
@@ -5189,6 +5268,7 @@ START_TEST(rtl)
test_RtlInitializeCriticalSectionEx();
test_RtlLeaveCriticalSection();
test_LdrEnumerateLoadedModules();