mirror of
https://gitlab.winehq.org/wine/wine-staging.git
synced 2024-09-13 09:17:20 -07:00
Rebase against 87733a69f7448d25539cbc4fc37d2e93466f38de.
This commit is contained in:
Alistair Leslie-Hughes
parent
8be56c21f9
commit
f3298432f0
@ -1,18 +1,18 @@
|
||||
From 9e585de1f2f28e1ef18c1edca875779c491375cb Mon Sep 17 00:00:00 2001
|
||||
From aa9cb874b1fb89601d6a5a735b442b8a7aa7b3aa Mon Sep 17 00:00:00 2001
|
||||
From: Sebastian Lackner <sebastian@fds-team.de>
|
||||
Date: Thu, 2 Oct 2014 19:44:31 +0200
|
||||
Subject: [PATCH] kernel32: Add winediag message to show warning, that this
|
||||
isn't vanilla wine.
|
||||
|
||||
---
|
||||
dlls/kernel32/process.c | 10 ++++++++++
|
||||
1 file changed, 10 insertions(+)
|
||||
dlls/kernel32/process.c | 11 +++++++++++
|
||||
1 file changed, 11 insertions(+)
|
||||
|
||||
diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c
|
||||
index 36ed82bff8c..b8a677c5485 100644
|
||||
index 8f506fcf1320..45bfe7fe7b5d 100644
|
||||
--- a/dlls/kernel32/process.c
|
||||
+++ b/dlls/kernel32/process.c
|
||||
@@ -65,6 +65,7 @@
|
||||
@@ -60,6 +60,7 @@
|
||||
|
||||
WINE_DEFAULT_DEBUG_CHANNEL(process);
|
||||
WINE_DECLARE_DEBUG_CHANNEL(relay);
|
||||
@ -20,7 +20,15 @@ index 36ed82bff8c..b8a677c5485 100644
|
||||
|
||||
typedef struct
|
||||
{
|
||||
@@ -997,6 +998,15 @@ void WINAPI start_process( LPTHREAD_START_ROUTINE entry, PEB *peb )
|
||||
@@ -125,6 +126,7 @@ static inline DWORD call_process_entry( PEB *peb, LPTHREAD_START_ROUTINE entry )
|
||||
}
|
||||
#endif
|
||||
|
||||
+extern const char * CDECL wine_get_version(void);
|
||||
/***********************************************************************
|
||||
* __wine_start_process
|
||||
*
|
||||
@@ -150,6 +152,15 @@ void CDECL __wine_start_process( LPTHREAD_START_ROUTINE entry, PEB *peb )
|
||||
|
||||
__TRY
|
||||
{
|
||||
@ -37,5 +45,5 @@ index 36ed82bff8c..b8a677c5485 100644
|
||||
being_debugged = FALSE;
|
||||
|
||||
--
|
||||
2.23.0
|
||||
2.26.2
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
From 0257e39905c92e0cffaf2faa6418c3bec7298603 Mon Sep 17 00:00:00 2001
|
||||
From da0da9472013ed502f5f0aabcca5b8359ffdc1c4 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
|
||||
Date: Sat, 4 Feb 2017 16:20:37 +0100
|
||||
Subject: [PATCH] kernel32: Implement some processor group functions.
|
||||
@ -6,10 +6,10 @@ Subject: [PATCH] kernel32: Implement some processor group functions.
|
||||
---
|
||||
...pi-ms-win-core-kernel32-legacy-l1-1-0.spec | 2 +-
|
||||
...pi-ms-win-core-kernel32-legacy-l1-1-1.spec | 2 +-
|
||||
dlls/kernel32/cpu.c | 28 ++++++++++++++-----
|
||||
dlls/kernel32/kernel32.spec | 2 +-
|
||||
dlls/kernel32/tests/process.c | 23 +++++++++++++++
|
||||
5 files changed, 47 insertions(+), 10 deletions(-)
|
||||
dlls/kernel32/process.c | 26 ++++++++++++++++---
|
||||
dlls/kernel32/tests/process.c | 23 ++++++++++++++++
|
||||
5 files changed, 48 insertions(+), 7 deletions(-)
|
||||
|
||||
diff --git a/dlls/api-ms-win-core-kernel32-legacy-l1-1-0/api-ms-win-core-kernel32-legacy-l1-1-0.spec b/dlls/api-ms-win-core-kernel32-legacy-l1-1-0/api-ms-win-core-kernel32-legacy-l1-1-0.spec
|
||||
index e653ac6d2122..b6af37ab0aa2 100644
|
||||
@ -37,56 +37,8 @@ index 4998af04d9bc..5ce8e24713b5 100644
|
||||
@ stdcall GetNamedPipeClientProcessId(long ptr) kernel32.GetNamedPipeClientProcessId
|
||||
@ stdcall GetNamedPipeServerProcessId(long ptr) kernel32.GetNamedPipeServerProcessId
|
||||
@ stdcall GetNumaAvailableMemoryNodeEx(long ptr) kernel32.GetNumaAvailableMemoryNodeEx
|
||||
diff --git a/dlls/kernel32/cpu.c b/dlls/kernel32/cpu.c
|
||||
index 63014ea1c910..7d623556e660 100644
|
||||
--- a/dlls/kernel32/cpu.c
|
||||
+++ b/dlls/kernel32/cpu.c
|
||||
@@ -51,7 +51,9 @@ WINE_DEFAULT_DEBUG_CHANNEL(reg);
|
||||
*/
|
||||
WORD WINAPI GetActiveProcessorGroupCount(void)
|
||||
{
|
||||
- FIXME("semi-stub, always returning 1\n");
|
||||
+ TRACE("()\n");
|
||||
+
|
||||
+ /* systems with less than 64 logical processors only have group 0 */
|
||||
return 1;
|
||||
}
|
||||
|
||||
@@ -60,14 +62,26 @@ WORD WINAPI GetActiveProcessorGroupCount(void)
|
||||
*/
|
||||
DWORD WINAPI GetActiveProcessorCount(WORD group)
|
||||
{
|
||||
- SYSTEM_INFO si;
|
||||
- DWORD cpus;
|
||||
+ TRACE("(%u)\n", group);
|
||||
|
||||
- GetSystemInfo( &si );
|
||||
- cpus = si.dwNumberOfProcessors;
|
||||
+ if (group && group != ALL_PROCESSOR_GROUPS)
|
||||
+ {
|
||||
+ SetLastError(ERROR_INVALID_PARAMETER);
|
||||
+ return 0;
|
||||
+ }
|
||||
|
||||
- FIXME("semi-stub, returning %u\n", cpus);
|
||||
- return cpus;
|
||||
+ return system_info.NumberOfProcessors;
|
||||
+}
|
||||
+
|
||||
+/***********************************************************************
|
||||
+ * GetMaximumProcessorGroupCount (KERNEL32.@)
|
||||
+ */
|
||||
+WORD WINAPI GetMaximumProcessorGroupCount(void)
|
||||
+{
|
||||
+ TRACE("()\n");
|
||||
+
|
||||
+ /* systems with less than 64 logical processors only have group 0 */
|
||||
+ return 1;
|
||||
}
|
||||
|
||||
/***********************************************************************
|
||||
diff --git a/dlls/kernel32/kernel32.spec b/dlls/kernel32/kernel32.spec
|
||||
index a095a85e66b5..17e9e5babd53 100644
|
||||
index 1a6fdbab0185..6a1381b7c322 100644
|
||||
--- a/dlls/kernel32/kernel32.spec
|
||||
+++ b/dlls/kernel32/kernel32.spec
|
||||
@@ -717,7 +717,7 @@
|
||||
@ -98,8 +50,60 @@ index a095a85e66b5..17e9e5babd53 100644
|
||||
@ stdcall -import GetModuleFileNameA(long ptr long)
|
||||
@ stdcall -import GetModuleFileNameW(long ptr long)
|
||||
@ stdcall -import GetModuleHandleA(str)
|
||||
diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c
|
||||
index 8f506fcf1320..2f7ebb5edd25 100644
|
||||
--- a/dlls/kernel32/process.c
|
||||
+++ b/dlls/kernel32/process.c
|
||||
@@ -706,7 +706,9 @@ HRESULT WINAPI RegisterApplicationRecoveryCallback(APPLICATION_RECOVERY_CALLBACK
|
||||
*/
|
||||
WORD WINAPI GetActiveProcessorGroupCount(void)
|
||||
{
|
||||
- FIXME("semi-stub, always returning 1\n");
|
||||
+ TRACE("()\n");
|
||||
+
|
||||
+ /* systems with less than 64 logical processors only have group 0 */
|
||||
return 1;
|
||||
}
|
||||
|
||||
@@ -715,10 +717,14 @@ WORD WINAPI GetActiveProcessorGroupCount(void)
|
||||
*/
|
||||
DWORD WINAPI GetActiveProcessorCount(WORD group)
|
||||
{
|
||||
- DWORD cpus = system_info.NumberOfProcessors;
|
||||
+ TRACE("(%u)\n", group);
|
||||
|
||||
- FIXME("semi-stub, returning %u\n", cpus);
|
||||
- return cpus;
|
||||
+ if (group && group != ALL_PROCESSOR_GROUPS)
|
||||
+ {
|
||||
+ SetLastError(ERROR_INVALID_PARAMETER);
|
||||
+ return 0;
|
||||
+ }
|
||||
+ return system_info.NumberOfProcessors;
|
||||
}
|
||||
|
||||
/***********************************************************************
|
||||
@@ -732,6 +738,18 @@ DWORD WINAPI GetMaximumProcessorCount(WORD group)
|
||||
return cpus;
|
||||
}
|
||||
|
||||
+/***********************************************************************
|
||||
+ * GetMaximumProcessorGroupCount (KERNEL32.@)
|
||||
+ */
|
||||
+WORD WINAPI GetMaximumProcessorGroupCount(void)
|
||||
+{
|
||||
+ TRACE("()\n");
|
||||
+
|
||||
+ /* systems with less than 64 logical processors only have group 0 */
|
||||
+ return 1;
|
||||
+}
|
||||
+
|
||||
+
|
||||
/***********************************************************************
|
||||
* GetEnabledXStateFeatures (KERNEL32.@)
|
||||
*/
|
||||
diff --git a/dlls/kernel32/tests/process.c b/dlls/kernel32/tests/process.c
|
||||
index 2ecd3dc10e8c..39c17625c8af 100644
|
||||
index 32818042337b..da649eff62ed 100644
|
||||
--- a/dlls/kernel32/tests/process.c
|
||||
+++ b/dlls/kernel32/tests/process.c
|
||||
@@ -92,6 +92,7 @@ static SIZE_T (WINAPI *pGetLargePageMinimum)(void);
|
||||
@ -118,7 +122,7 @@ index 2ecd3dc10e8c..39c17625c8af 100644
|
||||
|
||||
return TRUE;
|
||||
}
|
||||
@@ -4050,6 +4052,26 @@ void test_parent_process_attribute(unsigned int level, HANDLE read_pipe)
|
||||
@@ -3955,6 +3957,26 @@ void test_parent_process_attribute(unsigned int level, HANDLE read_pipe)
|
||||
}
|
||||
}
|
||||
|
||||
@ -145,7 +149,7 @@ index 2ecd3dc10e8c..39c17625c8af 100644
|
||||
START_TEST(process)
|
||||
{
|
||||
HANDLE job;
|
||||
@@ -4160,6 +4182,7 @@ START_TEST(process)
|
||||
@@ -4065,6 +4087,7 @@ START_TEST(process)
|
||||
test_GetNumaProcessorNode();
|
||||
test_session_info();
|
||||
test_GetLogicalProcessorInformationEx();
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
From c2299b57da38098badb711e54f9baf9d8e1c1241 Mon Sep 17 00:00:00 2001
|
||||
From e31513df269b2ba58f0dc11cc5494b9db1e05cd4 Mon Sep 17 00:00:00 2001
|
||||
From: "Olivier F. R. Dierick" <o.dierick@piezo-forte.be>
|
||||
Date: Tue, 19 Apr 2016 07:33:32 +0200
|
||||
Subject: [PATCH] kernel32: Implement GetSystemDEPPolicy().
|
||||
@ -8,18 +8,18 @@ Subject: [PATCH] kernel32: Implement GetSystemDEPPolicy().
|
||||
1 file changed, 68 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/dlls/kernel32/process.c b/dlls/kernel32/process.c
|
||||
index 185278740e4..503a9797b59 100644
|
||||
index cf97affd6faf..78f80c5210f0 100644
|
||||
--- a/dlls/kernel32/process.c
|
||||
+++ b/dlls/kernel32/process.c
|
||||
@@ -58,6 +58,7 @@
|
||||
@@ -51,6 +51,7 @@
|
||||
#include "winbase.h"
|
||||
#include "wincon.h"
|
||||
#include "kernel_private.h"
|
||||
+#include "winreg.h"
|
||||
#include "psapi.h"
|
||||
#include "wine/exception.h"
|
||||
#include "wine/library.h"
|
||||
@@ -4399,8 +4400,73 @@ DWORD WINAPI WTSGetActiveConsoleSessionId(void)
|
||||
#include "wine/server.h"
|
||||
@@ -671,8 +672,73 @@ DWORD WINAPI WTSGetActiveConsoleSessionId(void)
|
||||
*/
|
||||
DEP_SYSTEM_POLICY_TYPE WINAPI GetSystemDEPPolicy(void)
|
||||
{
|
||||
@ -96,5 +96,5 @@ index 185278740e4..503a9797b59 100644
|
||||
|
||||
/**********************************************************************
|
||||
--
|
||||
2.17.1
|
||||
2.26.2
|
||||
|
||||
|
||||
@ -1,15 +1,15 @@
|
||||
From 20ab5002c02f1c11a9e4f8c03555f7c40939c3bf Mon Sep 17 00:00:00 2001
|
||||
From 72955906074bbc00e27f3a2493b6cb5b17662f02 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.
|
||||
|
||||
---
|
||||
dlls/ntdll/tests/Makefile.in | 2 +-
|
||||
dlls/ntdll/tests/rtl.c | 76 ++++++++++++++++++++++++++++++++++++++++++++
|
||||
2 files changed, 77 insertions(+), 1 deletion(-)
|
||||
dlls/ntdll/tests/rtl.c | 80 ++++++++++++++++++++++++++++++++++++
|
||||
2 files changed, 81 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/dlls/ntdll/tests/Makefile.in b/dlls/ntdll/tests/Makefile.in
|
||||
index a1b8588..c5c5191 100644
|
||||
index ed15c51339f3..e4ae568532ea 100644
|
||||
--- a/dlls/ntdll/tests/Makefile.in
|
||||
+++ b/dlls/ntdll/tests/Makefile.in
|
||||
@@ -1,5 +1,5 @@
|
||||
@ -20,36 +20,40 @@ index a1b8588..c5c5191 100644
|
||||
C_SRCS = \
|
||||
atom.c \
|
||||
diff --git a/dlls/ntdll/tests/rtl.c b/dlls/ntdll/tests/rtl.c
|
||||
index ec12ea2..143e603 100644
|
||||
index 94c6b582f36b..c9482e782069 100644
|
||||
--- a/dlls/ntdll/tests/rtl.c
|
||||
+++ b/dlls/ntdll/tests/rtl.c
|
||||
@@ -26,6 +26,9 @@
|
||||
#include "ntdll_test.h"
|
||||
@@ -27,6 +27,9 @@
|
||||
#include "in6addr.h"
|
||||
#include "inaddr.h"
|
||||
#include "ip2string.h"
|
||||
+#include "initguid.h"
|
||||
+#define COBJMACROS
|
||||
+#include "shobjidl.h"
|
||||
|
||||
#ifndef __WINE_WINTERNL_H
|
||||
|
||||
@@ -103,6 +106,7 @@ static BOOL (WINAPI *pRtlIsCriticalSectionLocked)(CRITICAL_SECTION *);
|
||||
@@ -80,6 +83,9 @@ static BOOL (WINAPI *pRtlIsCriticalSectionLocked)(CRITICAL_SECTION *);
|
||||
static BOOL (WINAPI *pRtlIsCriticalSectionLockedByThread)(CRITICAL_SECTION *);
|
||||
static NTSTATUS (WINAPI *pRtlInitializeCriticalSectionEx)(CRITICAL_SECTION *, ULONG, ULONG);
|
||||
static NTSTATUS (WINAPI *pLdrEnumerateLoadedModules)(void *, void *, void *);
|
||||
+static NTSTATUS (WINAPI *pRtlQueryPackageIdentity)(HANDLE, WCHAR*, SIZE_T*, WCHAR*, SIZE_T*, BOOLEAN*);
|
||||
static NTSTATUS (WINAPI *pRtlMakeSelfRelativeSD)(PSECURITY_DESCRIPTOR,PSECURITY_DESCRIPTOR,LPDWORD);
|
||||
static NTSTATUS (WINAPI *pRtlAbsoluteToSelfRelativeSD)(PSECURITY_DESCRIPTOR,PSECURITY_DESCRIPTOR,PULONG);
|
||||
+static NTSTATUS (WINAPI *pRtlMakeSelfRelativeSD)(PSECURITY_DESCRIPTOR,PSECURITY_DESCRIPTOR,LPDWORD);
|
||||
+static NTSTATUS (WINAPI *pRtlAbsoluteToSelfRelativeSD)(PSECURITY_DESCRIPTOR,PSECURITY_DESCRIPTOR,PULONG);
|
||||
static NTSTATUS (WINAPI *pLdrRegisterDllNotification)(ULONG, PLDR_DLL_NOTIFICATION_FUNCTION, void *, void **);
|
||||
@@ -169,6 +173,7 @@ static void InitFunctionPtrs(void)
|
||||
static NTSTATUS (WINAPI *pLdrUnregisterDllNotification)(void *);
|
||||
|
||||
@@ -120,6 +126,9 @@ static void InitFunctionPtrs(void)
|
||||
pRtlIsCriticalSectionLockedByThread = (void *)GetProcAddress(hntdll, "RtlIsCriticalSectionLockedByThread");
|
||||
pRtlInitializeCriticalSectionEx = (void *)GetProcAddress(hntdll, "RtlInitializeCriticalSectionEx");
|
||||
pLdrEnumerateLoadedModules = (void *)GetProcAddress(hntdll, "LdrEnumerateLoadedModules");
|
||||
+ pRtlQueryPackageIdentity = (void *)GetProcAddress(hntdll, "RtlQueryPackageIdentity");
|
||||
pRtlMakeSelfRelativeSD = (void *)GetProcAddress(hntdll, "RtlMakeSelfRelativeSD");
|
||||
pRtlAbsoluteToSelfRelativeSD = (void *)GetProcAddress(hntdll, "RtlAbsoluteToSelfRelativeSD");
|
||||
+ pRtlMakeSelfRelativeSD = (void *)GetProcAddress(hntdll, "RtlMakeSelfRelativeSD");
|
||||
+ pRtlAbsoluteToSelfRelativeSD = (void *)GetProcAddress(hntdll, "RtlAbsoluteToSelfRelativeSD");
|
||||
pLdrRegisterDllNotification = (void *)GetProcAddress(hntdll, "LdrRegisterDllNotification");
|
||||
@@ -2946,6 +2951,76 @@ static void test_LdrRegisterDllNotification(void)
|
||||
pLdrUnregisterDllNotification = (void *)GetProcAddress(hntdll, "LdrUnregisterDllNotification");
|
||||
}
|
||||
@@ -3483,6 +3492,76 @@ static void test_LdrRegisterDllNotification(void)
|
||||
pLdrUnregisterDllNotification(cookie);
|
||||
}
|
||||
|
||||
@ -126,7 +130,7 @@ index ec12ea2..143e603 100644
|
||||
START_TEST(rtl)
|
||||
{
|
||||
InitFunctionPtrs();
|
||||
@@ -2980,6 +3055,7 @@ START_TEST(rtl)
|
||||
@@ -3521,6 +3600,7 @@ START_TEST(rtl)
|
||||
test_RtlInitializeCriticalSectionEx();
|
||||
test_RtlLeaveCriticalSection();
|
||||
test_LdrEnumerateLoadedModules();
|
||||
@ -135,5 +139,5 @@ index ec12ea2..143e603 100644
|
||||
test_LdrRegisterDllNotification();
|
||||
}
|
||||
--
|
||||
1.9.1
|
||||
2.26.2
|
||||
|
||||
|
||||
@ -1,45 +0,0 @@
|
||||
From 526cfe34f7c949216d79cf34ed71b3b61bc7c448 Mon Sep 17 00:00:00 2001
|
||||
From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
|
||||
Date: Sat, 23 May 2020 18:56:12 +1000
|
||||
Subject: [PATCH] ntoskrnl.exe: Add KeRevertToUserAffinityThreadEx stub
|
||||
|
||||
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49222
|
||||
Signed-off-by: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
|
||||
---
|
||||
dlls/ntoskrnl.exe/ntoskrnl.c | 7 +++++++
|
||||
dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 1 +
|
||||
2 files changed, 8 insertions(+)
|
||||
|
||||
diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c
|
||||
index bb5fbdbe17c3..ea5ead5c6dce 100644
|
||||
--- a/dlls/ntoskrnl.exe/ntoskrnl.c
|
||||
+++ b/dlls/ntoskrnl.exe/ntoskrnl.c
|
||||
@@ -2477,6 +2477,13 @@ void WINAPI KeRevertToUserAffinityThread(void)
|
||||
FIXME("() stub\n");
|
||||
}
|
||||
|
||||
+/***********************************************************************
|
||||
+ * KeRevertToUserAffinityThreadEx (NTOSKRNL.EXE.@)
|
||||
+ */
|
||||
+void WINAPI KeRevertToUserAffinityThreadEx(KAFFINITY affinity)
|
||||
+{
|
||||
+ FIXME("(%lx) stub\n", affinity);
|
||||
+}
|
||||
|
||||
/***********************************************************************
|
||||
* IoRegisterFileSystem (NTOSKRNL.EXE.@)
|
||||
diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec
|
||||
index a1e5e28203f5..e0fda1848354 100644
|
||||
--- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec
|
||||
+++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec
|
||||
@@ -618,6 +618,7 @@
|
||||
@ stdcall KeResetEvent(ptr)
|
||||
@ stub KeRestoreFloatingPointState
|
||||
@ stdcall KeRevertToUserAffinityThread()
|
||||
+@ stdcall KeRevertToUserAffinityThreadEx(long)
|
||||
@ stub KeRundownQueue
|
||||
@ stub KeSaveFloatingPointState
|
||||
@ stub KeSaveStateForHibernate
|
||||
--
|
||||
2.26.2
|
||||
|
||||
@ -1 +0,0 @@
|
||||
Fixes: [49222] ntoskrnl.exe: Add KeRevertToUserAffinityThreadEx stub
|
||||
@ -1,47 +0,0 @@
|
||||
From 2245f7f36233aa0fa07aa20b6972b05bfb3b1d0b Mon Sep 17 00:00:00 2001
|
||||
From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
|
||||
Date: Sat, 23 May 2020 18:45:25 +1000
|
||||
Subject: [PATCH] ntoskrnl.exe: Add KeSetSystemAffinityThreadEx stub
|
||||
|
||||
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=49219
|
||||
Signed-off-by: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
|
||||
---
|
||||
dlls/ntoskrnl.exe/ntoskrnl.c | 9 +++++++++
|
||||
dlls/ntoskrnl.exe/ntoskrnl.exe.spec | 1 +
|
||||
2 files changed, 10 insertions(+)
|
||||
|
||||
diff --git a/dlls/ntoskrnl.exe/ntoskrnl.c b/dlls/ntoskrnl.exe/ntoskrnl.c
|
||||
index 80f18b64d15d..bb5fbdbe17c3 100644
|
||||
--- a/dlls/ntoskrnl.exe/ntoskrnl.c
|
||||
+++ b/dlls/ntoskrnl.exe/ntoskrnl.c
|
||||
@@ -2459,6 +2459,15 @@ VOID WINAPI KeSetSystemAffinityThread(KAFFINITY Affinity)
|
||||
FIXME("(%lx) stub\n", Affinity);
|
||||
}
|
||||
|
||||
+/***********************************************************************
|
||||
+ * KeSetSystemAffinityThreadEx (NTOSKRNL.EXE.@)
|
||||
+ */
|
||||
+KAFFINITY WINAPI KeSetSystemAffinityThreadEx(KAFFINITY Affinity)
|
||||
+{
|
||||
+ FIXME("(%lx) stub\n", Affinity);
|
||||
+
|
||||
+ return 0;
|
||||
+}
|
||||
|
||||
/***********************************************************************
|
||||
* KeRevertToUserAffinityThread (NTOSKRNL.EXE.@)
|
||||
diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec
|
||||
index cae3ff34426b..a1e5e28203f5 100644
|
||||
--- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec
|
||||
+++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec
|
||||
@@ -633,6 +633,7 @@
|
||||
@ stdcall KeSetPriorityThread(ptr long)
|
||||
@ stub KeSetProfileIrql
|
||||
@ stdcall KeSetSystemAffinityThread(long)
|
||||
+@ stdcall KeSetSystemAffinityThreadEx(long)
|
||||
@ stdcall KeSetTargetProcessorDpc(ptr long)
|
||||
@ stub KeSetTimeIncrement
|
||||
@ stub KeSetTimer
|
||||
--
|
||||
2.26.2
|
||||
|
||||
@ -1,3 +0,0 @@
|
||||
Fixes: [49224] ntoskrnl.exe: Add KeGenericCallDpc stub
|
||||
Fixes: ntoskrnl.exe: Add KeSignalCallDpcSynchronize stub
|
||||
Fixes: ntoskrnl.exe: Add KeSignalCallDpcDone stub
|
||||
@ -214,8 +214,6 @@ patch_enable_all ()
|
||||
enable_ntdll_x86_64_SegDs="$1"
|
||||
enable_ntoskrnl_Stubs="$1"
|
||||
enable_ntoskrnl_exe_KeGenericCallDpc="$1"
|
||||
enable_ntoskrnl_exe_KeRevertToUserAffinityThreadEx="$1"
|
||||
enable_ntoskrnl_exe_KeSetSystemAffinityThreadEx="$1"
|
||||
enable_nvapi_Stub_DLL="$1"
|
||||
enable_nvcuda_CUDA_Support="$1"
|
||||
enable_nvcuvid_CUDA_Video_Support="$1"
|
||||
@ -748,12 +746,6 @@ patch_enable ()
|
||||
ntoskrnl.exe-KeGenericCallDpc)
|
||||
enable_ntoskrnl_exe_KeGenericCallDpc="$2"
|
||||
;;
|
||||
ntoskrnl.exe-KeRevertToUserAffinityThreadEx)
|
||||
enable_ntoskrnl_exe_KeRevertToUserAffinityThreadEx="$2"
|
||||
;;
|
||||
ntoskrnl.exe-KeSetSystemAffinityThreadEx)
|
||||
enable_ntoskrnl_exe_KeSetSystemAffinityThreadEx="$2"
|
||||
;;
|
||||
nvapi-Stub_DLL)
|
||||
enable_nvapi_Stub_DLL="$2"
|
||||
;;
|
||||
@ -4055,7 +4047,7 @@ fi
|
||||
# | Modified files:
|
||||
# | * dlls/api-ms-win-core-kernel32-legacy-l1-1-0/api-ms-win-core-kernel32-legacy-l1-1-0.spec, dlls/api-ms-win-core-
|
||||
# | kernel32-legacy-l1-1-1/api-ms-win-core-kernel32-legacy-l1-1-1.spec, dlls/kernel32/cpu.c, dlls/kernel32/kernel32.spec,
|
||||
# | dlls/kernel32/tests/process.c, dlls/kernelbase/thread.c, include/winnt.h
|
||||
# | dlls/kernel32/tests/process.c, dlls/kernelbase/thread.c
|
||||
# |
|
||||
if test "$enable_kernel32_Processor_Group" -eq 1; then
|
||||
patch_apply kernel32-Processor_Group/0001-kernel32-Implement-some-processor-group-functions.patch
|
||||
@ -4979,36 +4971,6 @@ if test "$enable_ntoskrnl_exe_KeGenericCallDpc" -eq 1; then
|
||||
) >> "$patchlist"
|
||||
fi
|
||||
|
||||
# Patchset ntoskrnl.exe-KeRevertToUserAffinityThreadEx
|
||||
# |
|
||||
# | This patchset fixes the following Wine bugs:
|
||||
# | * [#49222] ntoskrnl.exe: Add KeRevertToUserAffinityThreadEx stub
|
||||
# |
|
||||
# | Modified files:
|
||||
# | * dlls/ntoskrnl.exe/ntoskrnl.c, dlls/ntoskrnl.exe/ntoskrnl.exe.spec
|
||||
# |
|
||||
if test "$enable_ntoskrnl_exe_KeRevertToUserAffinityThreadEx" -eq 1; then
|
||||
patch_apply ntoskrnl.exe-KeRevertToUserAffinityThreadEx/0001-ntoskrnl.exe-Add-KeRevertToUserAffinityThreadEx-stub.patch
|
||||
(
|
||||
printf '%s\n' '+ { "Alistair Leslie-Hughes", "ntoskrnl.exe: Add KeRevertToUserAffinityThreadEx stub.", 1 },';
|
||||
) >> "$patchlist"
|
||||
fi
|
||||
|
||||
# Patchset ntoskrnl.exe-KeSetSystemAffinityThreadEx
|
||||
# |
|
||||
# | This patchset fixes the following Wine bugs:
|
||||
# | * [#49224] ntoskrnl.exe: Add KeGenericCallDpc stub
|
||||
# |
|
||||
# | Modified files:
|
||||
# | * dlls/ntoskrnl.exe/ntoskrnl.c, dlls/ntoskrnl.exe/ntoskrnl.exe.spec
|
||||
# |
|
||||
if test "$enable_ntoskrnl_exe_KeSetSystemAffinityThreadEx" -eq 1; then
|
||||
patch_apply ntoskrnl.exe-KeSetSystemAffinityThreadEx/0001-ntoskrnl.exe-Add-KeSetSystemAffinityThreadEx-stub.patch
|
||||
(
|
||||
printf '%s\n' '+ { "Alistair Leslie-Hughes", "ntoskrnl.exe: Add KeSetSystemAffinityThreadEx stub.", 1 },';
|
||||
) >> "$patchlist"
|
||||
fi
|
||||
|
||||
# Patchset nvcuvid-CUDA_Video_Support
|
||||
# |
|
||||
# | This patchset has the following (direct or indirect) dependencies:
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
From 98e637cc4bdb5f5ac793e5bfb567b299cb9a7dcc Mon Sep 17 00:00:00 2001
|
||||
From 06fef705b2735f358f64443c2c3f5c1904eae273 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
|
||||
Date: Thu, 8 Jun 2017 23:50:03 +0200
|
||||
Subject: [PATCH] programs/winedevice: Load some common drivers and fix ldr
|
||||
@ -10,7 +10,7 @@ Subject: [PATCH] programs/winedevice: Load some common drivers and fix ldr
|
||||
2 files changed, 76 insertions(+)
|
||||
|
||||
diff --git a/dlls/ntoskrnl.exe/tests/driver.c b/dlls/ntoskrnl.exe/tests/driver.c
|
||||
index 65be4a8d35a8..3920a3710799 100644
|
||||
index 356c60a2e78d..bdc69c16f448 100644
|
||||
--- a/dlls/ntoskrnl.exe/tests/driver.c
|
||||
+++ b/dlls/ntoskrnl.exe/tests/driver.c
|
||||
@@ -44,6 +44,7 @@ static const WCHAR driver_link[] = {'\\','D','o','s','D','e','v','i','c','e','s'
|
||||
@ -29,8 +29,8 @@ index 65be4a8d35a8..3920a3710799 100644
|
||||
static void test_lookup_thread(void)
|
||||
{
|
||||
NTSTATUS status;
|
||||
@@ -1740,6 +1742,52 @@ static void test_affinity(void)
|
||||
ok(mask == ~((~0u) << cpu_count), "Got unexpected mask %#lx.\n", mask);
|
||||
@@ -1779,6 +1781,52 @@ static void test_affinity(void)
|
||||
KeRevertToUserAffinityThread();
|
||||
}
|
||||
|
||||
+static void test_default_modules(void)
|
||||
@ -82,7 +82,7 @@ index 65be4a8d35a8..3920a3710799 100644
|
||||
static NTSTATUS main_test(DEVICE_OBJECT *device, IRP *irp, IO_STACK_LOCATION *stack)
|
||||
{
|
||||
ULONG length = stack->Parameters.DeviceIoControl.OutputBufferLength;
|
||||
@@ -1786,6 +1834,7 @@ static NTSTATUS main_test(DEVICE_OBJECT *device, IRP *irp, IO_STACK_LOCATION *st
|
||||
@@ -1825,6 +1873,7 @@ static NTSTATUS main_test(DEVICE_OBJECT *device, IRP *irp, IO_STACK_LOCATION *st
|
||||
test_stack_callout();
|
||||
test_lookaside_list();
|
||||
test_ob_reference(test_input->path);
|
||||
@ -90,7 +90,7 @@ index 65be4a8d35a8..3920a3710799 100644
|
||||
test_resource();
|
||||
test_lookup_thread();
|
||||
test_IoAttachDeviceToDeviceStack();
|
||||
@@ -2037,6 +2086,7 @@ NTSTATUS WINAPI DriverEntry(DRIVER_OBJECT *driver, PUNICODE_STRING registry)
|
||||
@@ -2076,6 +2125,7 @@ NTSTATUS WINAPI DriverEntry(DRIVER_OBJECT *driver, PUNICODE_STRING registry)
|
||||
DbgPrint("loading driver\n");
|
||||
|
||||
driver_obj = driver;
|
||||
|
||||
@ -1 +1 @@
|
||||
86e388c9182a4121eab35353bdfae3f0f4fd5a40
|
||||
87733a69f7448d25539cbc4fc37d2e93466f38de
|
||||
|
||||
Loading…
Reference in New Issue
Block a user