wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2025-09-12 18:50:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

Rebase against 9eecacbeb1561218d4870c83f89a233cabbf7e0c.

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files

22
patches/ntdll-LdrEnumerateLoadedModules/0001-ntdll-Implement-LdrEnumerateLoadedModules.patch
View File

@@ -1,4 +1,4 @@
From eafb8e1b84a5ee717d5b0e22686303494fc5ccd3 Mon Sep 17 00:00:00 2001
From 7221933818afc91b76f6b12ead544570d8ff336a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Fri, 3 Feb 2017 00:05:10 +0100
Subject: ntdll: Implement LdrEnumerateLoadedModules.
@@ -10,10 +10,10 @@ Subject: ntdll: Implement LdrEnumerateLoadedModules.
3 files changed, 86 insertions(+), 1 deletion(-)
diff --git a/dlls/ntdll/loader.c b/dlls/ntdll/loader.c
index c0703f008a7..15acf0e197d 100644
index cf758505a4c..0b507da9a08 100644
--- a/dlls/ntdll/loader.c
+++ b/dlls/ntdll/loader.c
@@ -1523,6 +1523,37 @@ NTSTATUS WINAPI LdrFindEntryForAddress(const void* addr, PLDR_MODULE* pmod)
@@ -1393,6 +1393,37 @@ NTSTATUS WINAPI LdrFindEntryForAddress(const void* addr, PLDR_MODULE* pmod)
return STATUS_NO_MORE_ENTRIES;
}
@@ -52,10 +52,10 @@ index c0703f008a7..15acf0e197d 100644
* LdrLockLoaderLock (NTDLL.@)
*
diff --git a/dlls/ntdll/ntdll.spec b/dlls/ntdll/ntdll.spec
index 81767ede7d7..9921b4cb1cc 100644
index b4269a679fc..66ecb7d0f37 100644
--- a/dlls/ntdll/ntdll.spec
+++ b/dlls/ntdll/ntdll.spec
@@ -63,7 +63,7 @@
@@ -62,7 +62,7 @@
# @ stub LdrDestroyOutOfProcessImage
@ stdcall LdrDisableThreadCalloutsForDll(long)
@ stub LdrEnumResources
@@ -65,10 +65,10 @@ index 81767ede7d7..9921b4cb1cc 100644
@ stdcall LdrFindEntryForAddress(ptr ptr)
@ stdcall LdrFindResourceDirectory_U(long ptr long ptr)
diff --git a/dlls/ntdll/tests/rtl.c b/dlls/ntdll/tests/rtl.c
index d96ced64cb0..cfff3f5ec49 100644
index 940c44a05bd..873437e7f4b 100644
--- a/dlls/ntdll/tests/rtl.c
+++ b/dlls/ntdll/tests/rtl.c
@@ -111,6 +111,7 @@ static BOOL (WINAPI *pRtlIsCriticalSectionLocked)(CRITICAL_SECTION *);
@@ -102,6 +102,7 @@ static BOOL (WINAPI *pRtlIsCriticalSectionLocked)(CRITICAL_SECTION *);
static BOOL (WINAPI *pRtlIsCriticalSectionLockedByThread)(CRITICAL_SECTION *);
static NTSTATUS (WINAPI *pRtlInitializeCriticalSectionEx)(CRITICAL_SECTION *, ULONG, ULONG);
static NTSTATUS (WINAPI *pRtlQueryPackageIdentity)(HANDLE, WCHAR*, SIZE_T*, WCHAR*, SIZE_T*, BOOLEAN*);
@@ -76,7 +76,7 @@ index d96ced64cb0..cfff3f5ec49 100644
static HMODULE hkernel32 = 0;
static BOOL (WINAPI *pIsWow64Process)(HANDLE, PBOOL);
@@ -173,6 +174,7 @@ static void InitFunctionPtrs(void)
@@ -156,6 +157,7 @@ static void InitFunctionPtrs(void)
pRtlIsCriticalSectionLockedByThread = (void *)GetProcAddress(hntdll, "RtlIsCriticalSectionLockedByThread");
pRtlInitializeCriticalSectionEx = (void *)GetProcAddress(hntdll, "RtlInitializeCriticalSectionEx");
pRtlQueryPackageIdentity = (void *)GetProcAddress(hntdll, "RtlQueryPackageIdentity");
@@ -84,7 +84,7 @@ index d96ced64cb0..cfff3f5ec49 100644
}
hkernel32 = LoadLibraryA("kernel32.dll");
ok(hkernel32 != 0, "LoadLibrary failed\n");
@@ -3230,6 +3232,57 @@ done:
@@ -2228,6 +2230,57 @@ done:
CoUninitialize();
}
@@ -142,9 +142,9 @@ index d96ced64cb0..cfff3f5ec49 100644
START_TEST(rtl)
{
InitFunctionPtrs();
@@ -3267,4 +3320,5 @@ START_TEST(rtl)
test_RtlIsCriticalSectionLocked();
@@ -2261,4 +2314,5 @@ START_TEST(rtl)
test_RtlInitializeCriticalSectionEx();
test_RtlLeaveCriticalSection();
test_RtlQueryPackageIdentity();
+ test_LdrEnumerateLoadedModules();
}