Rebase against 9eecacbeb1561218d4870c83f89a233cabbf7e0c.

This commit is contained in:
Sebastian Lackner
2017-03-08 22:56:02 +01:00
parent 37b0772439
commit 3b1cd79e05
13 changed files with 130 additions and 577 deletions

View File

@@ -1,4 +1,4 @@
From 733ae7526f2498282b42254b867e5c2d278b379a Mon Sep 17 00:00:00 2001
From 1ad505d34d229476373ba4f3422934f0440f2fee 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: ntdll/tests: Add basic tests for RtlQueryPackageIdentity.
@@ -9,7 +9,7 @@ Subject: ntdll/tests: Add basic tests for RtlQueryPackageIdentity.
2 files changed, 77 insertions(+), 1 deletion(-)
diff --git a/dlls/ntdll/tests/Makefile.in b/dlls/ntdll/tests/Makefile.in
index fc352dd..0de4fe8 100644
index fc352dd22be..0de4fe8f207 100644
--- a/dlls/ntdll/tests/Makefile.in
+++ b/dlls/ntdll/tests/Makefile.in
@@ -1,5 +1,5 @@
@@ -20,7 +20,7 @@ index fc352dd..0de4fe8 100644
C_SRCS = \
atom.c \
diff --git a/dlls/ntdll/tests/rtl.c b/dlls/ntdll/tests/rtl.c
index 1b17a7e..95b58c3 100644
index b18cccf4f35..940c44a05bd 100644
--- a/dlls/ntdll/tests/rtl.c
+++ b/dlls/ntdll/tests/rtl.c
@@ -25,6 +25,9 @@
@@ -33,7 +33,7 @@ index 1b17a7e..95b58c3 100644
#ifndef __WINE_WINTERNL_H
@@ -99,6 +102,7 @@ static NTSTATUS (WINAPI *pRtlCompressBuffer)(USHORT, const UCHAR*, ULONG, PUCHA
@@ -98,6 +101,7 @@ static NTSTATUS (WINAPI *pRtlCompressBuffer)(USHORT, const UCHAR*, ULONG, PUCHA
static BOOL (WINAPI *pRtlIsCriticalSectionLocked)(CRITICAL_SECTION *);
static BOOL (WINAPI *pRtlIsCriticalSectionLockedByThread)(CRITICAL_SECTION *);
static NTSTATUS (WINAPI *pRtlInitializeCriticalSectionEx)(CRITICAL_SECTION *, ULONG, ULONG);
@@ -41,7 +41,7 @@ index 1b17a7e..95b58c3 100644
static HMODULE hkernel32 = 0;
static BOOL (WINAPI *pIsWow64Process)(HANDLE, PBOOL);
@@ -153,6 +157,7 @@ static void InitFunctionPtrs(void)
@@ -151,6 +155,7 @@ static void InitFunctionPtrs(void)
pRtlIsCriticalSectionLocked = (void *)GetProcAddress(hntdll, "RtlIsCriticalSectionLocked");
pRtlIsCriticalSectionLockedByThread = (void *)GetProcAddress(hntdll, "RtlIsCriticalSectionLockedByThread");
pRtlInitializeCriticalSectionEx = (void *)GetProcAddress(hntdll, "RtlInitializeCriticalSectionEx");
@@ -49,8 +49,8 @@ index 1b17a7e..95b58c3 100644
}
hkernel32 = LoadLibraryA("kernel32.dll");
ok(hkernel32 != 0, "LoadLibrary failed\n");
@@ -2091,6 +2096,76 @@ static void test_RtlInitializeCriticalSectionEx(void)
RtlDeleteCriticalSection(&cs);
@@ -2153,6 +2158,76 @@ static void test_RtlLeaveCriticalSection(void)
ok(!status, "RtlDeleteCriticalSection failed: %x\n", status);
}
+static void test_RtlQueryPackageIdentity(void)
@@ -126,12 +126,12 @@ index 1b17a7e..95b58c3 100644
START_TEST(rtl)
{
InitFunctionPtrs();
@@ -2122,4 +2197,5 @@ START_TEST(rtl)
test_RtlDecompressBuffer();
@@ -2185,4 +2260,5 @@ START_TEST(rtl)
test_RtlIsCriticalSectionLocked();
test_RtlInitializeCriticalSectionEx();
test_RtlLeaveCriticalSection();
+ test_RtlQueryPackageIdentity();
}
--
2.7.1
2.11.0