wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2024-11-21 16:46:54 -08:00
Code Issues Packages Projects Releases Wiki Activity

Rebase against df0566d531b4454673eb71a0903986d215988e40.

Browse Source
This commit is contained in:
Alistair Leslie-Hughes 2022-03-03 10:13:09 +11:00
parent 8c4c65ff27
commit 1ba67d1cfb
5 changed files with 43 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
patches/mshtml-HTMLLocation_put_hash/0001-mshtml-Add-IHTMLLocation-hash-property-s-getter-impl.patch
View File

@ -1,4 +1,4 @@
From 214c0a64d5f0f3733c3e370f2a75329153617b2f Mon Sep 17 00:00:00 2001
From bef93835ceb4a482c348b0aa6e62ce4fee5e3f35 Mon Sep 17 00:00:00 2001
From: Zhenbo Li <litimetal@gmail.com>
Date: Tue, 1 Jul 2014 19:45:43 +0800
Subject: [PATCH] mshtml: Add IHTMLLocation::hash property's getter
@ -10,10 +10,10 @@ Subject: [PATCH] mshtml: Add IHTMLLocation::hash property's getter
2 files changed, 61 insertions(+), 3 deletions(-)
diff --git a/dlls/mshtml/htmllocation.c b/dlls/mshtml/htmllocation.c
index 7d102044c..a6d689397 100644
index 8f7800ff2a3..2b42939a39f 100644
--- a/dlls/mshtml/htmllocation.c
+++ b/dlls/mshtml/htmllocation.c
@@ -526,8 +526,15 @@ static HRESULT WINAPI HTMLLocation_get_search(IHTMLLocation *iface, BSTR *p)
@@ -524,8 +524,15 @@ static HRESULT WINAPI HTMLLocation_get_search(IHTMLLocation *iface, BSTR *p)
static HRESULT WINAPI HTMLLocation_put_hash(IHTMLLocation *iface, BSTR v)
{
HTMLLocation *This = impl_from_IHTMLLocation(iface);
@ -32,7 +32,7 @@ index 7d102044c..a6d689397 100644
static HRESULT WINAPI HTMLLocation_get_hash(IHTMLLocation *iface, BSTR *p)
diff --git a/dlls/mshtml/tests/htmldoc.c b/dlls/mshtml/tests/htmldoc.c
index e473ee0f2..242ebbeee 100644
index ff050863b6f..2c118d89d1d 100644
--- a/dlls/mshtml/tests/htmldoc.c
+++ b/dlls/mshtml/tests/htmldoc.c
@@ -5963,6 +5963,56 @@ static void test_Persist(IHTMLDocument2 *doc, IMoniker *mon)
@ -93,7 +93,7 @@ index e473ee0f2..242ebbeee 100644
BOOL is_hash, DWORD dwl_flags)
{
@@ -6148,7 +6198,7 @@ static void test_load_history(IHTMLDocument2 *doc)
ok(hres == S_OK, "Could not get IPersistHistory iface: %08x\n", hres);
ok(hres == S_OK, "Could not get IPersistHistory iface: %08lx\n", hres);
prev_url = nav_url;
- nav_url = L"http://test.winehq.org/tests/winehq_snapshot/#test";
@ -101,7 +101,7 @@ index e473ee0f2..242ebbeee 100644
nav_serv_url = L"http://test.winehq.org/tests/winehq_snapshot/";
SET_EXPECT(Exec_ShellDocView_138);
@@ -7915,6 +7965,7 @@ static void test_HTMLDocument_http(BOOL with_wbapp)
@@ -8017,6 +8067,7 @@ static void test_HTMLDocument_http(BOOL with_wbapp)
nav_url = nav_serv_url = L"http://test.winehq.org/tests/winehq_snapshot/"; /* for valid prev nav_url */
if(support_wbapp) {
test_put_href(doc, FALSE, L"#test", L"http://test.winehq.org/tests/winehq_snapshot/#test", FALSE, TRUE, 0);
@ -110,5 +110,5 @@ index e473ee0f2..242ebbeee 100644
test_refresh(doc);
}
--
2.25.0
2.34.1

2
patches/patchinstall.sh
View File

@ -51,7 +51,7 @@ usage()
# Get the upstream commit sha
upstream_commit()
{
echo "89a8b32d7a976504ee98ba1a7d08574bc9bc00e6"
echo "df0566d531b4454673eb71a0903986d215988e40"
}
# Show version information

24
patches/winedevice-Default_Drivers/0004-programs-winedevice-Load-some-common-drivers-and-fix.patch
View File

@ -1,4 +1,4 @@
From f95c63015492ff46479930c17bb0736715ceadcf Mon Sep 17 00:00:00 2001
From 79fadd8815f6438b30804d202c252920dd3f9213 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 0d991cd98d6..4d13829229b 100644
index dc4f4ad993d..4a57cf56f75 100644
--- a/dlls/ntoskrnl.exe/tests/driver.c
+++ b/dlls/ntoskrnl.exe/tests/driver.c
@@ -52,6 +52,7 @@ static int kmemcmp( const void *ptr1, const void *ptr2, size_t n )
@ -21,16 +21,16 @@ index 0d991cd98d6..4d13829229b 100644
static POBJECT_TYPE *pExEventObjectType, *pIoFileObjectType, *pPsThreadType, *pIoDriverObjectType;
static PEPROCESS *pPsInitialSystemProcess;
@@ -1584,6 +1585,7 @@ static void test_resource(void)
ok(status == STATUS_SUCCESS, "got status %#x\n", status);
@@ -1712,6 +1713,7 @@ static void test_resource(void)
ok(status == STATUS_SUCCESS, "got status %#lx\n", status);
}
+
static void test_lookup_thread(void)
{
NTSTATUS status;
@@ -2099,6 +2101,52 @@ static void test_permanence(void)
ok(status == STATUS_OBJECT_NAME_NOT_FOUND, "got %#x\n", status);
@@ -2290,6 +2292,52 @@ static void test_permanence(void)
ok(status == STATUS_OBJECT_NAME_NOT_FOUND, "got %#lx\n", status);
}
+static void test_default_modules(void)
@ -82,7 +82,7 @@ index 0d991cd98d6..4d13829229b 100644
static NTSTATUS main_test(DEVICE_OBJECT *device, IRP *irp, IO_STACK_LOCATION *stack)
{
void *buffer = irp->AssociatedIrp.SystemBuffer;
@@ -2130,6 +2178,7 @@ static NTSTATUS main_test(DEVICE_OBJECT *device, IRP *irp, IO_STACK_LOCATION *st
@@ -2322,6 +2370,7 @@ static NTSTATUS main_test(DEVICE_OBJECT *device, IRP *irp, IO_STACK_LOCATION *st
test_stack_callout();
test_lookaside_list();
test_ob_reference();
@ -90,7 +90,7 @@ index 0d991cd98d6..4d13829229b 100644
test_resource();
test_lookup_thread();
test_IoAttachDeviceToDeviceStack();
@@ -2530,6 +2579,7 @@ NTSTATUS WINAPI DriverEntry(DRIVER_OBJECT *driver, PUNICODE_STRING registry)
@@ -2801,6 +2850,7 @@ NTSTATUS WINAPI DriverEntry(DRIVER_OBJECT *driver, PUNICODE_STRING registry)
DbgPrint("loading driver\n");
driver_obj = driver;
@ -99,10 +99,10 @@ index 0d991cd98d6..4d13829229b 100644
/* Allow unloading of the driver */
driver->DriverUnload = driver_Unload;
diff --git a/programs/winedevice/device.c b/programs/winedevice/device.c
index 509cab96308..14f8c9e4704 100644
index 0a96307a017..abcb7b20679 100644
--- a/programs/winedevice/device.c
+++ b/programs/winedevice/device.c
@@ -121,8 +121,16 @@ static DWORD WINAPI service_handler( DWORD ctrl, DWORD event_type, LPVOID event_
@@ -122,8 +122,16 @@ static DWORD WINAPI service_handler( DWORD ctrl, DWORD event_type, LPVOID event_
static void WINAPI ServiceMain( DWORD argc, LPWSTR *argv )
{
@ -119,7 +119,7 @@ index 509cab96308..14f8c9e4704 100644
if (!(stop_event = CreateEventW( NULL, TRUE, FALSE, NULL )))
return;
@@ -135,6 +143,24 @@ static void WINAPI ServiceMain( DWORD argc, LPWSTR *argv )
@@ -136,6 +144,24 @@ static void WINAPI ServiceMain( DWORD argc, LPWSTR *argv )
wcscat( driver_dir, L"\\drivers" );
AddDllDirectory( driver_dir );
@ -145,5 +145,5 @@ index 509cab96308..14f8c9e4704 100644
set_service_status( service_handle, SERVICE_RUNNING,
SERVICE_ACCEPT_STOP | SERVICE_ACCEPT_SHUTDOWN );
--
2.30.2
2.34.1

39
patches/winex11-CandidateWindowPos/0001-winex11.drv-Update-a-candidate-window-s-position-wit.patch
View File

@ -1,4 +1,4 @@
From 19a4bd8f76819adf43158402935a3b49f37d946e Mon Sep 17 00:00:00 2001
From 11c77aff12c68d21157e54cf26c81032a20bc4eb Mon Sep 17 00:00:00 2001
From: Felix Yan <felixonmars@gmail.com>
Date: Tue, 23 Sep 2014 23:22:17 +0800
Subject: [PATCH] winex11.drv: Update a candidate window's position with
@ -23,8 +23,8 @@ received a lot of help from Sebastian Lackner.
dlls/winex11.drv/init.c | 1 +
dlls/winex11.drv/x11drv.h | 1 +
dlls/winex11.drv/xim.c | 72 ++++++++++++++++++++++++++++++++++++++-
include/wine/gdi_driver.h | 5 +++
7 files changed, 96 insertions(+), 1 deletion(-)
include/wine/gdi_driver.h | 6 ++++
7 files changed, 97 insertions(+), 1 deletion(-)
diff --git a/dlls/user32/caret.c b/dlls/user32/caret.c
index 2da7e02ca1a..1dd3ff29de4 100644
@ -56,10 +56,10 @@ index 2da7e02ca1a..1dd3ff29de4 100644
}
return ret;
diff --git a/dlls/user32/driver.c b/dlls/user32/driver.c
index 7e9f63ad1c7..1a144bb78c9 100644
index 56637b613e9..946ed37a76e 100644
--- a/dlls/user32/driver.c
+++ b/dlls/user32/driver.c
@@ -341,6 +341,11 @@ static BOOL CDECL loaderdrv_UpdateLayeredWindow( HWND hwnd, const UPDATELAYEREDW
@@ -294,6 +294,11 @@ static BOOL CDECL loaderdrv_UpdateLayeredWindow( HWND hwnd, const UPDATELAYEREDW
return load_driver()->pUpdateLayeredWindow( hwnd, info, window_rect );
}
@ -71,20 +71,20 @@ index 7e9f63ad1c7..1a144bb78c9 100644
static struct user_driver_funcs lazy_load_driver =
{
{ NULL },
@@ -393,6 +398,8 @@ static struct user_driver_funcs lazy_load_driver =
@@ -348,6 +353,8 @@ static struct user_driver_funcs lazy_load_driver =
NULL,
/* vulkan support */
/* opengl support */
NULL,
+ /* candidate pos functions */
+ loaderdrv_UpdateCandidatePos,
/* thread management */
NULL
NULL,
};
diff --git a/dlls/win32u/driver.c b/dlls/win32u/driver.c
index b3a3e70f83f..3f8542e3b20 100644
index 67a051f59f1..73e77b7c2c1 100644
--- a/dlls/win32u/driver.c
+++ b/dlls/win32u/driver.c
@@ -931,11 +931,17 @@ static BOOL CDECL nulldrv_SystemParametersInfo( UINT action, UINT int_param, voi
@@ -917,6 +917,7 @@ static BOOL CDECL nulldrv_SystemParametersInfo( UINT action, UINT int_param, voi
return FALSE;
}
@ -92,6 +92,8 @@ index b3a3e70f83f..3f8542e3b20 100644
static const struct vulkan_funcs * CDECL nulldrv_wine_get_vulkan_driver( UINT version )
{
return NULL;
@@ -927,6 +928,11 @@ static struct opengl_funcs * CDECL nulldrv_wine_get_wgl_driver( UINT version )
return (void *)-1;
}
+static void CDECL nulldrv_UpdateCandidatePos( HWND hwnd, const RECT *caret_rect )
@ -102,22 +104,22 @@ index b3a3e70f83f..3f8542e3b20 100644
static void CDECL nulldrv_ThreadDetach( void )
{
}
@@ -1133,6 +1139,7 @@ void CDECL __wine_set_display_driver( struct user_driver_funcs *driver, UINT ver
SET_USER_FUNC(WindowPosChanged);
@@ -1135,6 +1141,7 @@ void CDECL __wine_set_display_driver( struct user_driver_funcs *driver, UINT ver
SET_USER_FUNC(SystemParametersInfo);
SET_USER_FUNC(wine_get_vulkan_driver);
SET_USER_FUNC(wine_get_wgl_driver);
+ SET_USER_FUNC(UpdateCandidatePos);
SET_USER_FUNC(ThreadDetach);
#undef SET_USER_FUNC
diff --git a/dlls/winex11.drv/init.c b/dlls/winex11.drv/init.c
index 1f0549e4d39..7ed3ef7183c 100644
index 9f2be685dec..4fb100e684b 100644
--- a/dlls/winex11.drv/init.c
+++ b/dlls/winex11.drv/init.c
@@ -422,6 +422,7 @@ static const struct user_driver_funcs x11drv_funcs =
.pWindowPosChanged = X11DRV_WindowPosChanged,
@@ -415,6 +415,7 @@ static const struct user_driver_funcs x11drv_funcs =
.pSystemParametersInfo = X11DRV_SystemParametersInfo,
.pwine_get_vulkan_driver = X11DRV_wine_get_vulkan_driver,
.pwine_get_wgl_driver = X11DRV_wine_get_wgl_driver,
+ .pUpdateCandidatePos = X11DRV_UpdateCandidatePos,
.pThreadDetach = X11DRV_ThreadDetach,
};
@ -238,16 +240,19 @@ index 3994c2106cc..ec943dcd623 100644
return xic;
}
diff --git a/include/wine/gdi_driver.h b/include/wine/gdi_driver.h
index 567a6c21608..ff92d097f7d 100644
index e6f8239e27d..560c21b18c1 100644
--- a/include/wine/gdi_driver.h
+++ b/include/wine/gdi_driver.h
@@ -319,8 +319,13 @@ struct user_driver_funcs
@@ -318,10 +318,16 @@ struct user_driver_funcs
const RECT *,struct window_surface*);
/* system parameters */
BOOL (CDECL *pSystemParametersInfo)(UINT,UINT,void*,UINT);
+
/* vulkan support */
const struct vulkan_funcs * (CDECL *pwine_get_vulkan_driver)(UINT);
+
/* opengl support */
struct opengl_funcs * (CDECL *pwine_get_wgl_driver)(UINT);
+
+ /* IME functions */
+ void (CDECL *pUpdateCandidatePos)(HWND, const RECT *);

2
staging/upstream-commit
View File

@ -1 +1 @@
89a8b32d7a976504ee98ba1a7d08574bc9bc00e6
df0566d531b4454673eb71a0903986d215988e40