mirror of
https://gitlab.winehq.org/wine/wine-staging.git
synced 2025-01-28 22:04:43 -08:00
Rebase against 56f34c7489cb463981e987a59aee9f8780fef7cd.
This commit is contained in:
Zebediah Figura
parent
06fbe73760
commit
3a1bf0a033
@ -52,7 +52,7 @@ usage()
|
||||
# Get the upstream commit sha
|
||||
upstream_commit()
|
||||
{
|
||||
echo "6d35c10a7b7155dd552a3ad1a266d205e38f8765"
|
||||
echo "56f34c7489cb463981e987a59aee9f8780fef7cd"
|
||||
}
|
||||
|
||||
# Show version information
|
||||
|
||||
@ -1,19 +1,19 @@
|
||||
From 64f1e74ea66f6dbf3f429ad9fe47a998611029e3 Mon Sep 17 00:00:00 2001
|
||||
From 14c6fa09988e5d52e8f26bc6a05cff3860cb1887 Mon Sep 17 00:00:00 2001
|
||||
From: Louis Lenders <xerox.xerox2000x@gmail.com>
|
||||
Date: Mon, 17 Sep 2018 17:26:21 +0200
|
||||
Subject: [PATCH] user32: Added GetPointerType stub
|
||||
|
||||
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45765
|
||||
---
|
||||
.../api-ms-win-rtcore-ntuser-wmpointer-l1-1-0.spec | 2 +-
|
||||
dlls/user32/misc.c | 12 ++++++++++++
|
||||
dlls/user32/tests/input.c | 17 +++++++++++++++++
|
||||
dlls/user32/user32.spec | 1 +
|
||||
include/winuser.h | 1 +
|
||||
...i-ms-win-rtcore-ntuser-wmpointer-l1-1-0.spec | 2 +-
|
||||
dlls/user32/misc.c | 12 ++++++++++++
|
||||
dlls/user32/tests/input.c | 17 +++++++++++++++++
|
||||
dlls/user32/user32.spec | 1 +
|
||||
include/winuser.h | 1 +
|
||||
5 files changed, 32 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/dlls/api-ms-win-rtcore-ntuser-wmpointer-l1-1-0/api-ms-win-rtcore-ntuser-wmpointer-l1-1-0.spec b/dlls/api-ms-win-rtcore-ntuser-wmpointer-l1-1-0/api-ms-win-rtcore-ntuser-wmpointer-l1-1-0.spec
|
||||
index 93ecc1b..c58d51a 100644
|
||||
index 93ecc1b3e..c58d51a47 100644
|
||||
--- a/dlls/api-ms-win-rtcore-ntuser-wmpointer-l1-1-0/api-ms-win-rtcore-ntuser-wmpointer-l1-1-0.spec
|
||||
+++ b/dlls/api-ms-win-rtcore-ntuser-wmpointer-l1-1-0/api-ms-win-rtcore-ntuser-wmpointer-l1-1-0.spec
|
||||
@@ -17,7 +17,7 @@
|
||||
@ -26,7 +26,7 @@ index 93ecc1b..c58d51a 100644
|
||||
@ stub InitializeTouchInjection
|
||||
@ stub InjectTouchInput
|
||||
diff --git a/dlls/user32/misc.c b/dlls/user32/misc.c
|
||||
index d28cd9f..058f47a 100644
|
||||
index d28cd9fd0..058f47af3 100644
|
||||
--- a/dlls/user32/misc.c
|
||||
+++ b/dlls/user32/misc.c
|
||||
@@ -664,6 +664,18 @@ BOOL WINAPI RegisterTouchHitTestingWindow(HWND hwnd, ULONG value)
|
||||
@ -49,7 +49,7 @@ index d28cd9f..058f47a 100644
|
||||
static const WCHAR imeW[] = {'I','M','E',0};
|
||||
const struct builtin_class_descr IME_builtin_class =
|
||||
diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c
|
||||
index b43e076..db27085 100644
|
||||
index 1f02654b3..af4c5573e 100644
|
||||
--- a/dlls/user32/tests/input.c
|
||||
+++ b/dlls/user32/tests/input.c
|
||||
@@ -79,6 +79,7 @@ static struct {
|
||||
@ -59,16 +59,16 @@ index b43e076..db27085 100644
|
||||
+static BOOL (WINAPI *pGetPointerType)(UINT32, POINTER_INPUT_TYPE*);
|
||||
static int (WINAPI *pGetMouseMovePointsEx) (UINT, LPMOUSEMOVEPOINT, LPMOUSEMOVEPOINT, int, DWORD);
|
||||
static UINT (WINAPI *pGetRawInputDeviceList) (PRAWINPUTDEVICELIST, PUINT, UINT);
|
||||
static int (WINAPI *pGetWindowRgnBox)(HWND, LPRECT);
|
||||
@@ -165,6 +166,7 @@ static void init_function_pointers(void)
|
||||
static UINT (WINAPI *pGetRawInputDeviceInfoW) (HANDLE, UINT, void *, UINT *);
|
||||
@@ -167,6 +168,7 @@ static void init_function_pointers(void)
|
||||
GET_PROC(SendInput);
|
||||
GET_PROC(GetCurrentInputMessageSource);
|
||||
GET_PROC(GetMouseMovePointsEx);
|
||||
+ GET_PROC(GetPointerType);
|
||||
GET_PROC(GetRawInputDeviceList);
|
||||
GET_PROC(GetWindowRgnBox);
|
||||
#undef GET_PROC
|
||||
@@ -2935,6 +2937,16 @@ static void test_input_message_source(void)
|
||||
GET_PROC(GetRawInputDeviceInfoW);
|
||||
GET_PROC(GetRawInputDeviceInfoA);
|
||||
@@ -3065,6 +3067,16 @@ static void test_input_message_source(void)
|
||||
UnregisterClassA( cls.lpszClassName, GetModuleHandleA(0) );
|
||||
}
|
||||
|
||||
@ -85,7 +85,7 @@ index b43e076..db27085 100644
|
||||
START_TEST(input)
|
||||
{
|
||||
POINT pos;
|
||||
@@ -2979,4 +2991,9 @@ START_TEST(input)
|
||||
@@ -3110,4 +3122,9 @@ START_TEST(input)
|
||||
win_skip("GetCurrentInputMessageSource is not available\n");
|
||||
|
||||
SetCursorPos( pos.x, pos.y );
|
||||
@ -96,7 +96,7 @@ index b43e076..db27085 100644
|
||||
+ win_skip("GetPointerType is not available\n");
|
||||
}
|
||||
diff --git a/dlls/user32/user32.spec b/dlls/user32/user32.spec
|
||||
index d5b8597..f9a4ae2 100644
|
||||
index d5b8597d8..f9a4ae26d 100644
|
||||
--- a/dlls/user32/user32.spec
|
||||
+++ b/dlls/user32/user32.spec
|
||||
@@ -356,6 +356,7 @@
|
||||
@ -108,10 +108,10 @@ index d5b8597..f9a4ae2 100644
|
||||
@ stdcall GetProcessDefaultLayout(ptr)
|
||||
@ stdcall GetProcessDpiAwarenessInternal(long ptr)
|
||||
diff --git a/include/winuser.h b/include/winuser.h
|
||||
index 693965a..1b8e01e 100644
|
||||
index 6300cc9a3..8c9305467 100644
|
||||
--- a/include/winuser.h
|
||||
+++ b/include/winuser.h
|
||||
@@ -3828,6 +3828,7 @@ WINUSERAPI HWND WINAPI GetNextDlgTabItem(HWND,HWND,BOOL);
|
||||
@@ -3831,6 +3831,7 @@ WINUSERAPI HWND WINAPI GetNextDlgTabItem(HWND,HWND,BOOL);
|
||||
WINUSERAPI HWND WINAPI GetOpenClipboardWindow(void);
|
||||
WINUSERAPI HWND WINAPI GetParent(HWND);
|
||||
WINUSERAPI BOOL WINAPI GetPhysicalCursorPos(POINT*);
|
||||
@ -120,5 +120,5 @@ index 693965a..1b8e01e 100644
|
||||
WINUSERAPI BOOL WINAPI GetProcessDefaultLayout(DWORD*);
|
||||
WINUSERAPI BOOL WINAPI GetProcessDpiAwarenessInternal(HANDLE,DPI_AWARENESS*);
|
||||
--
|
||||
1.9.1
|
||||
2.20.1
|
||||
|
||||
|
||||
@ -1,33 +1,33 @@
|
||||
From 6d305aa851638a81ec74de02d1f1da5d74257d22 Mon Sep 17 00:00:00 2001
|
||||
From a7ae70a05ac6fe683dabd546cca5b8be184428b5 Mon Sep 17 00:00:00 2001
|
||||
From: Sebastian Lackner <sebastian@fds-team.de>
|
||||
Date: Mon, 29 May 2017 06:04:18 +0200
|
||||
Subject: [PATCH] user32/tests: Add tests for window region of layered windows.
|
||||
|
||||
---
|
||||
dlls/user32/tests/input.c | 70 +++++++++++++++++++++++++++++++++++++++++++++++
|
||||
dlls/user32/tests/input.c | 70 +++++++++++++++++++++++++++++++++++++++
|
||||
1 file changed, 70 insertions(+)
|
||||
|
||||
diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c
|
||||
index cdaf321..83daccb 100644
|
||||
index 4efca268f..ddb203710 100644
|
||||
--- a/dlls/user32/tests/input.c
|
||||
+++ b/dlls/user32/tests/input.c
|
||||
@@ -81,6 +81,7 @@ static UINT (WINAPI *pSendInput) (UINT, INPUT*, size_t);
|
||||
static BOOL (WINAPI *pGetCurrentInputMessageSource)( INPUT_MESSAGE_SOURCE *source );
|
||||
static int (WINAPI *pGetMouseMovePointsEx) (UINT, LPMOUSEMOVEPOINT, LPMOUSEMOVEPOINT, int, DWORD);
|
||||
@@ -83,6 +83,7 @@ static int (WINAPI *pGetMouseMovePointsEx) (UINT, LPMOUSEMOVEPOINT, LPMOUSEMOVEP
|
||||
static UINT (WINAPI *pGetRawInputDeviceList) (PRAWINPUTDEVICELIST, PUINT, UINT);
|
||||
static UINT (WINAPI *pGetRawInputDeviceInfoW) (HANDLE, UINT, void *, UINT *);
|
||||
static UINT (WINAPI *pGetRawInputDeviceInfoA) (HANDLE, UINT, void *, UINT *);
|
||||
+static int (WINAPI *pGetWindowRgnBox)(HWND, LPRECT);
|
||||
|
||||
#define MAXKEYEVENTS 12
|
||||
#define MAXKEYMESSAGES MAXKEYEVENTS /* assuming a key event generates one
|
||||
@@ -165,6 +166,7 @@ static void init_function_pointers(void)
|
||||
GET_PROC(GetCurrentInputMessageSource);
|
||||
GET_PROC(GetMouseMovePointsEx);
|
||||
@@ -169,6 +170,7 @@ static void init_function_pointers(void)
|
||||
GET_PROC(GetRawInputDeviceList);
|
||||
GET_PROC(GetRawInputDeviceInfoW);
|
||||
GET_PROC(GetRawInputDeviceInfoA);
|
||||
+ GET_PROC(GetWindowRgnBox);
|
||||
#undef GET_PROC
|
||||
}
|
||||
|
||||
@@ -1924,6 +1926,9 @@ static void test_Input_mouse(void)
|
||||
@@ -2054,6 +2056,9 @@ static void test_Input_mouse(void)
|
||||
DWORD thread_id;
|
||||
WNDCLASSA wclass;
|
||||
POINT pt, pt_org;
|
||||
@ -37,7 +37,7 @@ index cdaf321..83daccb 100644
|
||||
MSG msg;
|
||||
BOOL ret;
|
||||
|
||||
@@ -2162,6 +2167,12 @@ static void test_Input_mouse(void)
|
||||
@@ -2292,6 +2297,12 @@ static void test_Input_mouse(void)
|
||||
while (wait_for_message(&msg)) DispatchMessageA(&msg);
|
||||
Sleep(100);
|
||||
|
||||
@ -50,7 +50,7 @@ index cdaf321..83daccb 100644
|
||||
got_button_down = got_button_up = FALSE;
|
||||
simulate_click(TRUE, 150, 150);
|
||||
while (wait_for_message(&msg))
|
||||
@@ -2188,6 +2199,12 @@ static void test_Input_mouse(void)
|
||||
@@ -2318,6 +2329,12 @@ static void test_Input_mouse(void)
|
||||
while (wait_for_message(&msg)) DispatchMessageA(&msg);
|
||||
Sleep(100);
|
||||
|
||||
@ -63,7 +63,7 @@ index cdaf321..83daccb 100644
|
||||
got_button_down = got_button_up = FALSE;
|
||||
simulate_click(TRUE, 150, 150);
|
||||
while (wait_for_message(&msg))
|
||||
@@ -2216,6 +2233,12 @@ static void test_Input_mouse(void)
|
||||
@@ -2346,6 +2363,12 @@ static void test_Input_mouse(void)
|
||||
while (wait_for_message(&msg)) DispatchMessageA(&msg);
|
||||
Sleep(100);
|
||||
|
||||
@ -76,7 +76,7 @@ index cdaf321..83daccb 100644
|
||||
got_button_down = got_button_up = FALSE;
|
||||
simulate_click(TRUE, 150, 150);
|
||||
while (wait_for_message(&msg))
|
||||
@@ -2242,6 +2265,12 @@ static void test_Input_mouse(void)
|
||||
@@ -2372,6 +2395,12 @@ static void test_Input_mouse(void)
|
||||
while (wait_for_message(&msg)) DispatchMessageA(&msg);
|
||||
Sleep(100);
|
||||
|
||||
@ -89,7 +89,7 @@ index cdaf321..83daccb 100644
|
||||
got_button_down = got_button_up = FALSE;
|
||||
simulate_click(TRUE, 150, 150);
|
||||
while (wait_for_message(&msg))
|
||||
@@ -2269,6 +2298,12 @@ static void test_Input_mouse(void)
|
||||
@@ -2399,6 +2428,12 @@ static void test_Input_mouse(void)
|
||||
while (wait_for_message(&msg)) DispatchMessageA(&msg);
|
||||
Sleep(100);
|
||||
|
||||
@ -102,7 +102,7 @@ index cdaf321..83daccb 100644
|
||||
got_button_down = got_button_up = FALSE;
|
||||
simulate_click(TRUE, 150, 150);
|
||||
while (wait_for_message(&msg))
|
||||
@@ -2290,6 +2325,41 @@ static void test_Input_mouse(void)
|
||||
@@ -2420,6 +2455,41 @@ static void test_Input_mouse(void)
|
||||
ok(got_button_down, "expected WM_LBUTTONDOWN message\n");
|
||||
ok(got_button_up, "expected WM_LBUTTONUP message\n");
|
||||
|
||||
@ -145,5 +145,5 @@ index cdaf321..83daccb 100644
|
||||
SetCursorPos(pt_org.x, pt_org.y);
|
||||
|
||||
--
|
||||
1.9.1
|
||||
2.20.1
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
From 7366d8005ea9236758e481dd41ed9a62c8abf7ce Mon Sep 17 00:00:00 2001
|
||||
From b9dbb8650b4b339de5e71cf5dab5c3ec321def58 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
|
||||
Date: Thu, 25 May 2017 21:46:27 +0200
|
||||
Subject: [PATCH] winebuild: Try to make sure RVA matches between fake and
|
||||
@ -7,14 +7,14 @@ Subject: [PATCH] winebuild: Try to make sure RVA matches between fake and
|
||||
---
|
||||
dlls/kernel32/tests/loader.c | 1 -
|
||||
libs/wine/loader.c | 13 +++++++++++--
|
||||
tools/winebuild/spec32.c | 23 ++++++++++++++++++++---
|
||||
3 files changed, 31 insertions(+), 6 deletions(-)
|
||||
tools/winebuild/spec32.c | 17 +++++++++++++++--
|
||||
3 files changed, 26 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c
|
||||
index 3e012ff..ffc28fd 100644
|
||||
index 96cd67ff4..3a441bf7b 100644
|
||||
--- a/dlls/kernel32/tests/loader.c
|
||||
+++ b/dlls/kernel32/tests/loader.c
|
||||
@@ -1449,7 +1449,6 @@ static void test_FakeDLL(void)
|
||||
@@ -1579,7 +1579,6 @@ static void test_FakeDLL(void)
|
||||
/* check position in memory */
|
||||
dll_rva = (DWORD_PTR)dll_func - (DWORD_PTR)module;
|
||||
map_rva = funcs[ordinals[i]];
|
||||
@ -23,7 +23,7 @@ index 3e012ff..ffc28fd 100644
|
||||
func_name, dll_rva, map_rva);
|
||||
|
||||
diff --git a/libs/wine/loader.c b/libs/wine/loader.c
|
||||
index 1dcb397..677e0fe 100644
|
||||
index 8f40ea049..163125c9e 100644
|
||||
--- a/libs/wine/loader.c
|
||||
+++ b/libs/wine/loader.c
|
||||
@@ -405,8 +405,12 @@ static void *map_dll( const IMAGE_NT_HEADERS *nt_descr )
|
||||
@ -54,10 +54,10 @@ index 1dcb397..677e0fe 100644
|
||||
|
||||
memcpy( sec->Name, ".text", sizeof(".text") );
|
||||
diff --git a/tools/winebuild/spec32.c b/tools/winebuild/spec32.c
|
||||
index 3955982..430c7a5 100644
|
||||
index 75b2474fa..d0b1367ef 100644
|
||||
--- a/tools/winebuild/spec32.c
|
||||
+++ b/tools/winebuild/spec32.c
|
||||
@@ -348,14 +348,24 @@ static void output_relay_debug( DLLSPEC *spec )
|
||||
@@ -378,14 +378,25 @@ static void output_relay_debug( DLLSPEC *spec )
|
||||
*/
|
||||
static void output_syscall_thunks( DLLSPEC *spec )
|
||||
{
|
||||
@ -77,6 +77,7 @@ index 3955982..430c7a5 100644
|
||||
+
|
||||
+ output( "\t.align %d\n", get_alignment(65536) );
|
||||
+ output( "__wine_spec_pe_header_syscalls:\n" );
|
||||
+ output( "__wine_spec_pe_header_syscalls_end:\n" );
|
||||
+ output( "\t.byte 0\n" );
|
||||
+ output( "\t.balign %d, 0\n", page_size );
|
||||
|
||||
@ -84,22 +85,15 @@ index 3955982..430c7a5 100644
|
||||
for (i = 0; i < spec->nb_syscalls; i++)
|
||||
{
|
||||
ORDDEF *odp = spec->syscalls[i];
|
||||
@@ -734,7 +744,14 @@ void output_module( DLLSPEC *spec )
|
||||
output( "\t.long 0,0\n" ); /* DataDirectory[12] */
|
||||
output( "\t.long 0,0\n" ); /* DataDirectory[13] */
|
||||
output( "\t.long 0,0\n" ); /* DataDirectory[14] */
|
||||
- output( "\t.long 0,0\n" ); /* DataDirectory[15] */
|
||||
+
|
||||
+ if (spec->nb_syscalls) /* DataDirectory[15] */
|
||||
+ {
|
||||
+ output( "\t%s __wine_spec_pe_header_syscalls\n", get_asm_ptr_keyword() );
|
||||
+ if (get_ptr_size() == 4) output( "\t.long 0\n" );
|
||||
+ }
|
||||
+ else
|
||||
+ output( "\t.long 0,0\n" );
|
||||
@@ -765,6 +776,8 @@ void output_module( DLLSPEC *spec )
|
||||
data_dirs[1] = ".L__wine_spec_imports"; /* DataDirectory[IMAGE_DIRECTORY_ENTRY_IMPORT] */
|
||||
if (spec->nb_resources)
|
||||
data_dirs[2] = ".L__wine_spec_resources"; /* DataDirectory[IMAGE_DIRECTORY_ENTRY_RESOURCE] */
|
||||
+ if (spec->nb_syscalls)
|
||||
+ data_dirs[15] = "__wine_spec_pe_header_syscalls";
|
||||
|
||||
output_data_directories( data_dirs );
|
||||
|
||||
output( "\n\t%s\n", get_asm_string_section() );
|
||||
output( "%s\n", asm_globl("__wine_spec_file_name") );
|
||||
--
|
||||
1.9.1
|
||||
2.20.1
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
From d7aefc52dbb93e36fb89acec49a349cb039fb7e8 Mon Sep 17 00:00:00 2001
|
||||
From a75cddcd2f710f40852647fcb2b4d6da9127c92b Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
|
||||
Date: Thu, 7 Sep 2017 00:38:09 +0200
|
||||
Subject: [PATCH] tools/winebuild: Add syscall thunks for 64 bit.
|
||||
@ -6,17 +6,17 @@ Subject: [PATCH] tools/winebuild: Add syscall thunks for 64 bit.
|
||||
---
|
||||
dlls/kernel32/tests/loader.c | 7 +-
|
||||
dlls/ntdll/signal_x86_64.c | 3 +
|
||||
dlls/ntdll/thread.c | 6 ++
|
||||
dlls/ntdll/thread.c | 6 +
|
||||
libs/wine/loader.c | 4 +
|
||||
tools/winebuild/parser.c | 2 +-
|
||||
tools/winebuild/spec32.c | 209 +++++++++++++++++++++++++++++++++++++++++--
|
||||
6 files changed, 223 insertions(+), 8 deletions(-)
|
||||
tools/winebuild/spec32.c | 210 ++++++++++++++++++++++++++++++++++-
|
||||
6 files changed, 224 insertions(+), 8 deletions(-)
|
||||
|
||||
diff --git a/dlls/kernel32/tests/loader.c b/dlls/kernel32/tests/loader.c
|
||||
index 028a187..c97ee75 100644
|
||||
index 94a5109b4..15ec89f14 100644
|
||||
--- a/dlls/kernel32/tests/loader.c
|
||||
+++ b/dlls/kernel32/tests/loader.c
|
||||
@@ -1564,7 +1564,7 @@ static void test_filenames(void)
|
||||
@@ -1527,7 +1527,7 @@ static void test_filenames(void)
|
||||
|
||||
static void test_FakeDLL(void)
|
||||
{
|
||||
@ -25,7 +25,7 @@ index 028a187..c97ee75 100644
|
||||
NTSTATUS (WINAPI *pNtSetEvent)(HANDLE, ULONG *) = NULL;
|
||||
IMAGE_EXPORT_DIRECTORY *dir;
|
||||
HMODULE module = GetModuleHandleA("ntdll.dll");
|
||||
@@ -1606,8 +1606,13 @@ static void test_FakeDLL(void)
|
||||
@@ -1569,8 +1569,13 @@ static void test_FakeDLL(void)
|
||||
|
||||
dll_func = (BYTE *)GetProcAddress(module, func_name);
|
||||
ok(dll_func != NULL, "%s: GetProcAddress returned NULL\n", func_name);
|
||||
@ -40,7 +40,7 @@ index 028a187..c97ee75 100644
|
||||
todo_wine ok(0, "%s: Export is a stub-function, skipping\n", func_name);
|
||||
continue;
|
||||
diff --git a/dlls/ntdll/signal_x86_64.c b/dlls/ntdll/signal_x86_64.c
|
||||
index 54871b8..0ce0c22 100644
|
||||
index 54871b830..0ce0c22d7 100644
|
||||
--- a/dlls/ntdll/signal_x86_64.c
|
||||
+++ b/dlls/ntdll/signal_x86_64.c
|
||||
@@ -328,6 +328,8 @@ static inline struct amd64_thread_data *amd64_thread_data(void)
|
||||
@ -61,7 +61,7 @@ index 54871b8..0ce0c22 100644
|
||||
return status;
|
||||
}
|
||||
diff --git a/dlls/ntdll/thread.c b/dlls/ntdll/thread.c
|
||||
index 1c09344..afe5731 100644
|
||||
index 394b3be60..11963689c 100644
|
||||
--- a/dlls/ntdll/thread.c
|
||||
+++ b/dlls/ntdll/thread.c
|
||||
@@ -60,6 +60,8 @@ struct _KUSER_SHARED_DATA *user_shared_data_external;
|
||||
@ -73,7 +73,7 @@ index 1c09344..afe5731 100644
|
||||
void (WINAPI *kernel32_start_process)(LPTHREAD_START_ROUTINE,void*) = NULL;
|
||||
|
||||
/* info passed to a starting thread */
|
||||
@@ -301,6 +303,10 @@ void thread_init(void)
|
||||
@@ -299,6 +301,10 @@ void thread_init(void)
|
||||
InitializeListHead( &ldr.InInitializationOrderModuleList );
|
||||
*(ULONG_PTR *)peb->Reserved = get_image_addr();
|
||||
|
||||
@ -85,7 +85,7 @@ index 1c09344..afe5731 100644
|
||||
* Starting with Vista, the first user to log on has session id 1.
|
||||
* Session id 0 is for processes that don't interact with the user (like services).
|
||||
diff --git a/libs/wine/loader.c b/libs/wine/loader.c
|
||||
index 162c94d..87eb5a8 100644
|
||||
index e33e5b669..1fbcfd7f6 100644
|
||||
--- a/libs/wine/loader.c
|
||||
+++ b/libs/wine/loader.c
|
||||
@@ -468,7 +468,11 @@ static void *map_dll( const IMAGE_NT_HEADERS *nt_descr )
|
||||
@ -101,7 +101,7 @@ index 162c94d..87eb5a8 100644
|
||||
sec++;
|
||||
|
||||
diff --git a/tools/winebuild/parser.c b/tools/winebuild/parser.c
|
||||
index b758ca0..3e69540 100644
|
||||
index b758ca0db..3e695406d 100644
|
||||
--- a/tools/winebuild/parser.c
|
||||
+++ b/tools/winebuild/parser.c
|
||||
@@ -549,7 +549,7 @@ static const char *parse_spec_flags( DLLSPEC *spec, ORDDEF *odp )
|
||||
@ -114,10 +114,10 @@ index b758ca0..3e69540 100644
|
||||
if (odp->flags & (FLAG_FORWARD | FLAG_REGISTER))
|
||||
return 0;
|
||||
diff --git a/tools/winebuild/spec32.c b/tools/winebuild/spec32.c
|
||||
index 3b18b6f..77bc8b4 100644
|
||||
index d0b1367ef..de510b3da 100644
|
||||
--- a/tools/winebuild/spec32.c
|
||||
+++ b/tools/winebuild/spec32.c
|
||||
@@ -357,11 +357,11 @@ static void output_relay_debug( DLLSPEC *spec )
|
||||
@@ -372,11 +372,11 @@ static void output_relay_debug( DLLSPEC *spec )
|
||||
}
|
||||
|
||||
/*******************************************************************
|
||||
@ -131,10 +131,11 @@ index 3b18b6f..77bc8b4 100644
|
||||
{
|
||||
const unsigned int page_size = get_page_size();
|
||||
int i;
|
||||
@@ -460,6 +460,90 @@ static void output_syscall_thunks( DLLSPEC *spec )
|
||||
@@ -475,6 +475,91 @@ static void output_syscall_thunks( DLLSPEC *spec )
|
||||
output_function_size( "__wine_syscall_dispatcher" );
|
||||
}
|
||||
|
||||
/*******************************************************************
|
||||
+/*******************************************************************
|
||||
+ * output_syscall_thunks_x64
|
||||
+ *
|
||||
+ * Output entry points for system call functions
|
||||
@ -155,6 +156,7 @@ index 3b18b6f..77bc8b4 100644
|
||||
+
|
||||
+ output( "\t.align %d\n", get_alignment(65536) );
|
||||
+ output( "__wine_spec_pe_header_syscalls:\n" );
|
||||
+ output( "__wine_spec_pe_header_syscalls_end:\n" );
|
||||
+ output( "\t.byte 0\n" );
|
||||
+ output( "\t.balign %d, 0\n", page_size );
|
||||
+
|
||||
@ -218,11 +220,10 @@ index 3b18b6f..77bc8b4 100644
|
||||
+ output_function_size( "__wine_syscall_dispatcher" );
|
||||
+}
|
||||
+
|
||||
+/*******************************************************************
|
||||
/*******************************************************************
|
||||
* output_exports
|
||||
*
|
||||
* Output the export table for a Win32 module.
|
||||
@@ -816,7 +900,10 @@ void BuildSpec32File( DLLSPEC *spec )
|
||||
@@ -803,7 +888,10 @@ void output_spec32_file( DLLSPEC *spec )
|
||||
open_output_file();
|
||||
output_standard_file_header();
|
||||
output_module( spec );
|
||||
@ -234,7 +235,7 @@ index 3b18b6f..77bc8b4 100644
|
||||
output_stubs( spec );
|
||||
output_exports( spec );
|
||||
output_imports( spec );
|
||||
@@ -829,7 +916,7 @@ void BuildSpec32File( DLLSPEC *spec )
|
||||
@@ -816,7 +904,7 @@ void output_spec32_file( DLLSPEC *spec )
|
||||
|
||||
static int needs_stub_exports( DLLSPEC *spec )
|
||||
{
|
||||
@ -243,7 +244,7 @@ index 3b18b6f..77bc8b4 100644
|
||||
return 0;
|
||||
if (!(spec->characteristics & IMAGE_FILE_DLL))
|
||||
return 0;
|
||||
@@ -839,7 +926,7 @@ static int needs_stub_exports( DLLSPEC *spec )
|
||||
@@ -826,7 +914,7 @@ static int needs_stub_exports( DLLSPEC *spec )
|
||||
}
|
||||
|
||||
|
||||
@ -252,7 +253,7 @@ index 3b18b6f..77bc8b4 100644
|
||||
{
|
||||
int i, nr_exports = spec->base <= spec->limit ? spec->limit - spec->base + 1 : 0;
|
||||
size_t rva, thunk;
|
||||
@@ -1001,6 +1088,113 @@ static void create_stub_exports_text( DLLSPEC *spec )
|
||||
@@ -988,6 +1076,113 @@ static void create_stub_exports_text( DLLSPEC *spec )
|
||||
}
|
||||
|
||||
|
||||
@ -366,7 +367,7 @@ index 3b18b6f..77bc8b4 100644
|
||||
static void create_stub_exports_data( DLLSPEC *spec )
|
||||
{
|
||||
int i;
|
||||
@@ -1200,7 +1394,10 @@ static void output_fake_module_pass( DLLSPEC *spec )
|
||||
@@ -1187,7 +1382,10 @@ static void output_fake_module_pass( DLLSPEC *spec )
|
||||
if (needs_stub_exports( spec ))
|
||||
{
|
||||
put_label( "text_start" );
|
||||
@ -379,5 +380,5 @@ index 3b18b6f..77bc8b4 100644
|
||||
}
|
||||
else
|
||||
--
|
||||
1.9.1
|
||||
2.20.1
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user