You've already forked wine-staging
mirror of
https://gitlab.winehq.org/wine/wine-staging.git
synced 2025-09-12 18:50:20 -07:00
Rebase against 21763489982177f4db9e5f8cc8ccb751441f5a2e.
This commit is contained in:
Sebastian Lackner
@@ -1,33 +1,44 @@
|
||||
From 32bb8b671dd0c6df8d3cf295447b3c8f7d3b7457 Mon Sep 17 00:00:00 2001
|
||||
From fce736fd0ec3a9d497cbbe4cd7ac7a6ca146f544 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
|
||||
Date: Thu, 11 May 2017 05:32:55 +0200
|
||||
Subject: winebuild: Generate syscall thunks for ntdll exports.
|
||||
|
||||
Based on a patch by Erich E. Hoover.
|
||||
---
|
||||
dlls/ntdll/signal_i386.c | 2 ++
|
||||
include/winternl.h | 2 +-
|
||||
tools/winebuild/build.h | 6 +++++
|
||||
tools/winebuild/import.c | 10 ++++---
|
||||
tools/winebuild/parser.c | 59 +++++++++++++++++++++++++++++++++++++++++
|
||||
tools/winebuild/spec16.c | 22 +---------------
|
||||
tools/winebuild/spec32.c | 68 ++++++++++++++++++++++++++++++++++++++++++++++++
|
||||
tools/winebuild/utils.c | 21 +++++++++++++++
|
||||
8 files changed, 164 insertions(+), 26 deletions(-)
|
||||
dlls/ntdll/signal_i386.c | 5 +++-
|
||||
dlls/ntdll/tests/exception.c | 2 ++
|
||||
include/winternl.h | 2 +-
|
||||
tools/winebuild/build.h | 6 ++++
|
||||
tools/winebuild/import.c | 10 ++++---
|
||||
tools/winebuild/parser.c | 59 ++++++++++++++++++++++++++++++++++++++
|
||||
tools/winebuild/spec16.c | 22 +-------------
|
||||
tools/winebuild/spec32.c | 68 ++++++++++++++++++++++++++++++++++++++++++++
|
||||
tools/winebuild/utils.c | 21 ++++++++++++++
|
||||
9 files changed, 168 insertions(+), 27 deletions(-)
|
||||
|
||||
diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c
|
||||
index d3da84c7be9..f2657045c94 100644
|
||||
index ef45e37c5fd..d015c4ea831 100644
|
||||
--- a/dlls/ntdll/signal_i386.c
|
||||
+++ b/dlls/ntdll/signal_i386.c
|
||||
@@ -481,6 +481,7 @@ static wine_signal_handler handlers[256];
|
||||
@@ -481,6 +481,8 @@ static wine_signal_handler handlers[256];
|
||||
static BOOL fpux_support; /* whether the CPU supports extended fpu context */
|
||||
|
||||
extern void DECLSPEC_NORETURN __wine_restore_regs( const CONTEXT *context );
|
||||
+extern void DECLSPEC_NORETURN __wine_syscall_dispatcher( void );
|
||||
+extern NTSTATUS WINAPI __syscall_NtGetContextThread( HANDLE handle, CONTEXT *context );
|
||||
|
||||
enum i386_trap_code
|
||||
{
|
||||
@@ -2434,6 +2435,7 @@ NTSTATUS signal_alloc_thread( TEB **teb )
|
||||
@@ -1499,7 +1501,7 @@ NTSTATUS CDECL __regs_NtGetContextThread( DWORD edi, DWORD esi, DWORD ebx, DWORD
|
||||
{
|
||||
context->Ebp = ebp;
|
||||
context->Esp = (DWORD)&retaddr;
|
||||
- context->Eip = *(&edi - 1);
|
||||
+ context->Eip = (DWORD)__syscall_NtGetContextThread + 18;
|
||||
context->SegCs = wine_get_cs();
|
||||
context->SegSs = wine_get_ss();
|
||||
context->EFlags = eflags;
|
||||
@@ -2469,6 +2471,7 @@ NTSTATUS signal_alloc_thread( TEB **teb )
|
||||
*teb = addr;
|
||||
(*teb)->Tib.Self = &(*teb)->Tib;
|
||||
(*teb)->Tib.ExceptionList = (void *)~0UL;
|
||||
@@ -35,11 +46,24 @@ index d3da84c7be9..f2657045c94 100644
|
||||
thread_data = (struct x86_thread_data *)(*teb)->SystemReserved2;
|
||||
if (!(thread_data->fs = wine_ldt_alloc_fs()))
|
||||
{
|
||||
diff --git a/dlls/ntdll/tests/exception.c b/dlls/ntdll/tests/exception.c
|
||||
index 90490871f36..f614ef0edb8 100644
|
||||
--- a/dlls/ntdll/tests/exception.c
|
||||
+++ b/dlls/ntdll/tests/exception.c
|
||||
@@ -1544,6 +1544,8 @@ static void test_thread_context(void)
|
||||
ok( (char *)context.Eip >= (char *)pNtGetContextThread - 0x10000 &&
|
||||
(char *)context.Eip <= (char *)pNtGetContextThread + 0x10000,
|
||||
"wrong Eip %08x/%08x\n", context.Eip, (DWORD)pNtGetContextThread );
|
||||
+ ok( *(WORD *)context.Eip == 0xc483 || *(WORD *)context.Eip == 0x08c2 || *(WORD *)context.Eip == 0x8dc3,
|
||||
+ "expected 0xc483 or 0x08c2 or 0x8dc3, got %04x\n", *(WORD *)context.Eip );
|
||||
/* segment registers clear the high word */
|
||||
ok( context.SegCs == LOWORD(expect.SegCs), "wrong SegCs %08x/%08x\n", context.SegCs, expect.SegCs );
|
||||
ok( context.SegDs == LOWORD(expect.SegDs), "wrong SegDs %08x/%08x\n", context.SegDs, expect.SegDs );
|
||||
diff --git a/include/winternl.h b/include/winternl.h
|
||||
index c11df3e53f6..80b7b91f906 100644
|
||||
index 404730ddbb6..b1871e689fa 100644
|
||||
--- a/include/winternl.h
|
||||
+++ b/include/winternl.h
|
||||
@@ -322,7 +322,7 @@ typedef struct _TEB
|
||||
@@ -323,7 +323,7 @@ typedef struct _TEB
|
||||
PVOID CsrClientThread; /* 03c/0070 */
|
||||
PVOID Win32ThreadInfo; /* 040/0078 */
|
||||
ULONG Win32ClientInfo[31]; /* 044/0080 used for user32 private data in Wine */
|
||||
@@ -134,7 +158,7 @@ index e7bad72c37b..cc8c422a33c 100644
|
||||
}
|
||||
}
|
||||
diff --git a/tools/winebuild/parser.c b/tools/winebuild/parser.c
|
||||
index 2762a8cd10e..d8dceaead28 100644
|
||||
index 2762a8cd10e..402c0d60368 100644
|
||||
--- a/tools/winebuild/parser.c
|
||||
+++ b/tools/winebuild/parser.c
|
||||
@@ -507,6 +507,24 @@ static const char *parse_spec_flags( DLLSPEC *spec, ORDDEF *odp )
|
||||
@@ -145,7 +169,7 @@ index 2762a8cd10e..d8dceaead28 100644
|
||||
+{
|
||||
+ if (target_cpu != CPU_x86)
|
||||
+ return 0;
|
||||
+ if (odp->flags & (FLAG_FORWARD | FLAG_NORELAY | FLAG_REGISTER))
|
||||
+ if (odp->flags & (FLAG_FORWARD | FLAG_REGISTER))
|
||||
+ return 0;
|
||||
+ if (odp->type != TYPE_STDCALL)
|
||||
+ return 0;
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
From 47c26e73121327980c26501ecb20cc6d6b08f3f3 Mon Sep 17 00:00:00 2001
|
||||
From c3d774f0b6613aac336b3a2ed28452fbb6a5f9c1 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
|
||||
Date: Mon, 15 May 2017 16:27:56 +0200
|
||||
Subject: winebuild: Add stub functions in fake dlls.
|
||||
@@ -13,10 +13,10 @@ Subject: winebuild: Add stub functions in fake dlls.
|
||||
6 files changed, 255 insertions(+), 15 deletions(-)
|
||||
|
||||
diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c
|
||||
index f8d45d829fc..77bac0861f7 100644
|
||||
index e9b05013875..6be54321d50 100644
|
||||
--- a/dlls/kernel32/tests/loader.c
|
||||
+++ b/dlls/kernel32/tests/loader.c
|
||||
@@ -856,9 +856,7 @@ static void test_FakeDLL(void)
|
||||
@@ -892,9 +892,7 @@ static void test_FakeDLL(void)
|
||||
ok(ptr != NULL, "MapViewOfFile failed with error %u\n", GetLastError());
|
||||
|
||||
dir = RtlImageDirectoryEntryToData(ptr, TRUE, IMAGE_DIRECTORY_ENTRY_EXPORT, &size);
|
||||
@@ -26,7 +26,7 @@ index f8d45d829fc..77bac0861f7 100644
|
||||
|
||||
names = RVAToAddr(dir->AddressOfNames, ptr);
|
||||
ordinals = RVAToAddr(dir->AddressOfNameOrdinals, ptr);
|
||||
@@ -887,17 +885,20 @@ todo_wine
|
||||
@@ -923,17 +921,20 @@ todo_wine
|
||||
/* check position in memory */
|
||||
dll_rva = (DWORD_PTR)dll_func - (DWORD_PTR)module;
|
||||
map_rva = funcs[ordinals[i]];
|
||||
@@ -47,7 +47,7 @@ index f8d45d829fc..77bac0861f7 100644
|
||||
ok(!memcmp(map_func, dll_func, 0x20), "%s: Function content does not match!\n", func_name);
|
||||
|
||||
if (!strcmp(func_name, "NtSetEvent"))
|
||||
@@ -911,10 +912,11 @@ todo_wine
|
||||
@@ -947,10 +948,11 @@ todo_wine
|
||||
ok(event != NULL, "CreateEvent failed with error %u\n", GetLastError());
|
||||
pNtSetEvent(event, 0);
|
||||
ok(WaitForSingleObject(event, 0) == WAIT_OBJECT_0, "Event was not signaled\n");
|
||||
@@ -61,12 +61,12 @@ index f8d45d829fc..77bac0861f7 100644
|
||||
CloseHandle(map);
|
||||
CloseHandle(file);
|
||||
diff --git a/dlls/ntdll/signal_i386.c b/dlls/ntdll/signal_i386.c
|
||||
index f2657045c94..c2375d6f0e8 100644
|
||||
index d015c4ea831..3818e696c49 100644
|
||||
--- a/dlls/ntdll/signal_i386.c
|
||||
+++ b/dlls/ntdll/signal_i386.c
|
||||
@@ -483,6 +483,45 @@ static BOOL fpux_support; /* whether the CPU supports extended fpu context */
|
||||
extern void DECLSPEC_NORETURN __wine_restore_regs( const CONTEXT *context );
|
||||
@@ -484,6 +484,45 @@ extern void DECLSPEC_NORETURN __wine_restore_regs( const CONTEXT *context );
|
||||
extern void DECLSPEC_NORETURN __wine_syscall_dispatcher( void );
|
||||
extern NTSTATUS WINAPI __syscall_NtGetContextThread( HANDLE handle, CONTEXT *context );
|
||||
|
||||
+/* convert from straight ASCII to Unicode without depending on the current codepage */
|
||||
+static inline void ascii_to_unicode( WCHAR *dst, const char *src, size_t len )
|
||||
@@ -110,7 +110,7 @@ index f2657045c94..c2375d6f0e8 100644
|
||||
enum i386_trap_code
|
||||
{
|
||||
TRAP_x86_UNKNOWN = -1, /* Unknown fault (TRAP_sig not defined) */
|
||||
@@ -2436,6 +2475,7 @@ NTSTATUS signal_alloc_thread( TEB **teb )
|
||||
@@ -2472,6 +2511,7 @@ NTSTATUS signal_alloc_thread( TEB **teb )
|
||||
(*teb)->Tib.Self = &(*teb)->Tib;
|
||||
(*teb)->Tib.ExceptionList = (void *)~0UL;
|
||||
(*teb)->WOW32Reserved = __wine_syscall_dispatcher;
|
||||
@@ -119,10 +119,10 @@ index f2657045c94..c2375d6f0e8 100644
|
||||
if (!(thread_data->fs = wine_ldt_alloc_fs()))
|
||||
{
|
||||
diff --git a/include/winternl.h b/include/winternl.h
|
||||
index 80b7b91f906..4780aca43a3 100644
|
||||
index b1871e689fa..140669b0105 100644
|
||||
--- a/include/winternl.h
|
||||
+++ b/include/winternl.h
|
||||
@@ -362,7 +362,7 @@ typedef struct _TEB
|
||||
@@ -363,7 +363,7 @@ typedef struct _TEB
|
||||
PVOID WinSockData; /* f6c/1738 */
|
||||
ULONG GdiBatchCount; /* f70/1740 */
|
||||
ULONG Spare2; /* f74/1744 */
|
||||
|
||||
Reference in New Issue
Block a user