mirror of
https://gitlab.winehq.org/wine/wine-staging.git
synced 2024-11-21 16:46:54 -08:00
Rebase against 2b29d02aa5ba65465b4adc017cdca9a8932b0dbe
This commit is contained in:
Alistair Leslie-Hughes
parent
1f77584097
commit
ded2e22686
@ -1,4 +1,4 @@
|
||||
From 9d2559409ee8860dd21dd86aedb9442389ba41fe Mon Sep 17 00:00:00 2001
|
||||
From 7bb09137aab184c1c2a36c1be27f6d8105ce2a11 Mon Sep 17 00:00:00 2001
|
||||
From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
|
||||
Date: Tue, 9 Jul 2019 14:13:28 +1000
|
||||
Subject: [PATCH] user32: Improve GetKeyboardLayoutList
|
||||
@ -11,7 +11,7 @@ not the complete list from the registry.
|
||||
2 files changed, 35 insertions(+), 27 deletions(-)
|
||||
|
||||
diff --git a/dlls/user32/driver.c b/dlls/user32/driver.c
|
||||
index 921ea2c962..953eec47de 100644
|
||||
index 921ea2c962d..953eec47dea 100644
|
||||
--- a/dlls/user32/driver.c
|
||||
+++ b/dlls/user32/driver.c
|
||||
@@ -213,12 +213,9 @@ static SHORT CDECL nulldrv_GetAsyncKeyState( INT key )
|
||||
@ -59,10 +59,10 @@ index 921ea2c962..953eec47de 100644
|
||||
if (baselayout != 0)
|
||||
{
|
||||
diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c
|
||||
index d0dc4a8bcf..4a99d8d4e9 100644
|
||||
index 1e6be311eeb..1653c07b20b 100644
|
||||
--- a/dlls/user32/tests/input.c
|
||||
+++ b/dlls/user32/tests/input.c
|
||||
@@ -2862,6 +2862,40 @@ static void test_GetPointerType(void)
|
||||
@@ -2990,6 +2990,40 @@ static void test_GetPointerType(void)
|
||||
ok(type == PT_MOUSE, " type %d\n", type );
|
||||
}
|
||||
|
||||
@ -103,14 +103,14 @@ index d0dc4a8bcf..4a99d8d4e9 100644
|
||||
START_TEST(input)
|
||||
{
|
||||
POINT pos;
|
||||
@@ -2885,6 +2919,7 @@ START_TEST(input)
|
||||
@@ -3013,6 +3047,7 @@ START_TEST(input)
|
||||
test_GetKeyState();
|
||||
test_OemKeyScan();
|
||||
test_GetRawInputData();
|
||||
+ test_GetKeyboardLayoutList();
|
||||
test_RegisterRawInputDevices();
|
||||
|
||||
if(pGetMouseMovePointsEx)
|
||||
test_GetMouseMovePointsEx();
|
||||
--
|
||||
2.17.1
|
||||
2.24.0.rc1
|
||||
|
||||
|
||||
@ -52,7 +52,7 @@ usage()
|
||||
# Get the upstream commit sha
|
||||
upstream_commit()
|
||||
{
|
||||
echo "6f2ef158b78f7d0a950c9398c26278d6523c112e"
|
||||
echo "2b29d02aa5ba65465b4adc017cdca9a8932b0dbe"
|
||||
}
|
||||
|
||||
# Show version information
|
||||
|
||||
@ -1,8 +1,7 @@
|
||||
From 95c0fd89fcdd6517d0c8f6272ba41180bbda301c Mon Sep 17 00:00:00 2001
|
||||
From e03798a18cb82cfd9e0123c9d4f7c3b5e7547d8b Mon Sep 17 00:00:00 2001
|
||||
From: Sebastian Lackner <sebastian@fds-team.de>
|
||||
Date: Mon, 29 May 2017 05:30:44 +0200
|
||||
Subject: [PATCH 2/5] user32/tests: Add tests for clicking through layered
|
||||
window.
|
||||
Subject: [PATCH] user32/tests: Add tests for clicking through layered window.
|
||||
|
||||
FIXME:
|
||||
|
||||
@ -12,22 +11,22 @@ FIXME:
|
||||
* Add tests with WS_CHILD layered Windows. On Windows this is supported for
|
||||
>= Win8, but only when a manifest is present.
|
||||
---
|
||||
dlls/user32/tests/input.c | 156 ++++++++++++++++++++++++++++++++++++++++++++++
|
||||
dlls/user32/tests/input.c | 156 ++++++++++++++++++++++++++++++++++++++
|
||||
1 file changed, 156 insertions(+)
|
||||
|
||||
diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c
|
||||
index 437e70c..3a3e611 100644
|
||||
index 91a595794a8..d03fe47c41c 100644
|
||||
--- a/dlls/user32/tests/input.c
|
||||
+++ b/dlls/user32/tests/input.c
|
||||
@@ -53,6 +53,7 @@
|
||||
@@ -54,6 +54,7 @@
|
||||
#include "windef.h"
|
||||
#include "winbase.h"
|
||||
#include "winuser.h"
|
||||
+#include "wingdi.h"
|
||||
#include "winnls.h"
|
||||
#include "ddk/hidsdi.h"
|
||||
|
||||
#include "wine/test.h"
|
||||
@@ -1926,6 +1927,7 @@ static void test_Input_mouse(void)
|
||||
@@ -2216,6 +2217,7 @@ static void test_Input_mouse(void)
|
||||
struct thread_data thread_data;
|
||||
HANDLE thread;
|
||||
DWORD thread_id;
|
||||
@ -35,7 +34,7 @@ index 437e70c..3a3e611 100644
|
||||
POINT pt, pt_org;
|
||||
MSG msg;
|
||||
BOOL ret;
|
||||
@@ -2140,6 +2142,160 @@ static void test_Input_mouse(void)
|
||||
@@ -2430,6 +2432,160 @@ static void test_Input_mouse(void)
|
||||
ok(got_button_up, "expected WM_LBUTTONUP message\n");
|
||||
DestroyWindow(hwnd);
|
||||
ok(ReleaseCapture(), "ReleaseCapture failed\n");
|
||||
@ -197,5 +196,5 @@ index 437e70c..3a3e611 100644
|
||||
|
||||
CloseHandle(thread_data.start_event);
|
||||
--
|
||||
2.7.4
|
||||
2.24.0.rc1
|
||||
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
From dd2e4e6f027c1517870cf678c954351ab79c9510 Mon Sep 17 00:00:00 2001
|
||||
From 922bbc203c309dde57dc836fea516a364822d2c6 Mon Sep 17 00:00:00 2001
|
||||
From: Dmitry Timoshkov <dmitry@baikal.ru>
|
||||
Date: Wed, 23 Dec 2015 19:37:37 +0800
|
||||
Subject: [PATCH] widl: Add initial implementation of SLTG typelib generator.
|
||||
@ -12,7 +12,7 @@ Subject: [PATCH] widl: Add initial implementation of SLTG typelib generator.
|
||||
create mode 100644 tools/widl/write_sltg.c
|
||||
|
||||
diff --git a/tools/widl/Makefile.in b/tools/widl/Makefile.in
|
||||
index e06d6cc5..e7a41c30 100644
|
||||
index 80a12601de9..2736cd7874e 100644
|
||||
--- a/tools/widl/Makefile.in
|
||||
+++ b/tools/widl/Makefile.in
|
||||
@@ -14,7 +14,8 @@ C_SRCS = \
|
||||
@ -26,7 +26,7 @@ index e06d6cc5..e7a41c30 100644
|
||||
LEX_SRCS = parser.l
|
||||
BISON_SRCS = parser.y
|
||||
diff --git a/tools/widl/typelib.h b/tools/widl/typelib.h
|
||||
index 7df7d290..5d9f45a7 100644
|
||||
index 7df7d290825..5d9f45a7c38 100644
|
||||
--- a/tools/widl/typelib.h
|
||||
+++ b/tools/widl/typelib.h
|
||||
@@ -83,4 +83,5 @@ enum VARENUM {
|
||||
@ -36,26 +36,26 @@ index 7df7d290..5d9f45a7 100644
|
||||
+extern int create_sltg_typelib(typelib_t *typelib);
|
||||
#endif
|
||||
diff --git a/tools/widl/widl.c b/tools/widl/widl.c
|
||||
index 410efb4c..2e980bf8 100644
|
||||
index aa6697135be..a361d862337 100644
|
||||
--- a/tools/widl/widl.c
|
||||
+++ b/tools/widl/widl.c
|
||||
@@ -158,6 +158,7 @@ enum {
|
||||
DLLDATA_OPTION,
|
||||
@@ -167,6 +167,7 @@ enum {
|
||||
DLLDATA_ONLY_OPTION,
|
||||
LOCAL_STUBS_OPTION,
|
||||
NOSTDINC_OPTION,
|
||||
+ OLD_TYPELIB_OPTION,
|
||||
PREFIX_ALL_OPTION,
|
||||
PREFIX_CLIENT_OPTION,
|
||||
PREFIX_SERVER_OPTION,
|
||||
@@ -182,6 +183,7 @@ static const struct option long_options[] = {
|
||||
{ "local-stubs", 1, NULL, LOCAL_STUBS_OPTION },
|
||||
@@ -193,6 +194,7 @@ static const struct option long_options[] = {
|
||||
{ "nostdinc", 0, NULL, NOSTDINC_OPTION },
|
||||
{ "ns_prefix", 0, NULL, RT_NS_PREFIX },
|
||||
{ "oldnames", 0, NULL, OLDNAMES_OPTION },
|
||||
+ { "oldtlb", 0, NULL, OLD_TYPELIB_OPTION },
|
||||
{ "output", 0, NULL, 'o' },
|
||||
{ "prefix-all", 1, NULL, PREFIX_ALL_OPTION },
|
||||
{ "prefix-client", 1, NULL, PREFIX_CLIENT_OPTION },
|
||||
@@ -697,6 +699,10 @@ int main(int argc,char *argv[])
|
||||
@@ -725,6 +727,10 @@ int main(int argc,char *argv[])
|
||||
do_everything = 0;
|
||||
do_typelib = 1;
|
||||
break;
|
||||
@ -68,7 +68,7 @@ index 410efb4c..2e980bf8 100644
|
||||
break;
|
||||
diff --git a/tools/widl/write_sltg.c b/tools/widl/write_sltg.c
|
||||
new file mode 100644
|
||||
index 00000000..c4ddaed9
|
||||
index 00000000000..3c478ca667d
|
||||
--- /dev/null
|
||||
+++ b/tools/widl/write_sltg.c
|
||||
@@ -0,0 +1,557 @@
|
||||
@ -630,5 +630,5 @@ index 00000000..c4ddaed9
|
||||
+ return 1;
|
||||
+}
|
||||
--
|
||||
2.19.1
|
||||
2.24.0.rc1
|
||||
|
||||
|
||||
@ -1,24 +1,24 @@
|
||||
From bd3806f58fda1d13e1359cc06854b81e22ce15e2 Mon Sep 17 00:00:00 2001
|
||||
From d2ba2796fbd8f9d107f5f3814ddc405713ca5a70 Mon Sep 17 00:00:00 2001
|
||||
From: Sebastian Lackner <sebastian@fds-team.de>
|
||||
Date: Thu, 21 Jan 2016 02:51:56 +0100
|
||||
Subject: widl: Add --oldtlb switch in usage message.
|
||||
Subject: [PATCH] widl: Add --oldtlb switch in usage message.
|
||||
|
||||
---
|
||||
tools/widl/widl.c | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/tools/widl/widl.c b/tools/widl/widl.c
|
||||
index 9761fa4f..a8a76db6 100644
|
||||
index cf59d7513cb..611735fcae7 100644
|
||||
--- a/tools/widl/widl.c
|
||||
+++ b/tools/widl/widl.c
|
||||
@@ -61,6 +61,7 @@ static const char usage[] =
|
||||
" -m32, -m64 Set the target architecture (Win32 or Win64)\n"
|
||||
" -N Do not preprocess input\n"
|
||||
@@ -63,6 +63,7 @@ static const char usage[] =
|
||||
" --nostdinc Do not search the standard include path\n"
|
||||
" --ns_prefix Prefix namespaces with ABI namespace\n"
|
||||
" --oldnames Use old naming conventions\n"
|
||||
+" --oldtlb Use old typelib (SLTG) format\n"
|
||||
" -o, --output=NAME Set the output file name\n"
|
||||
" -Otype Type of stubs to generate (-Os, -Oi, -Oif)\n"
|
||||
" -p Generate proxy\n"
|
||||
--
|
||||
2.19.1
|
||||
2.24.0.rc1
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user