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 c0ea1ad37d3343c403d80ee18bf0d90c2699148b.

Browse Source
This commit is contained in:
Alistair Leslie-Hughes 2021-12-01 10:27:42 +11:00
parent 3b7c98ebf1
commit 4c51f4f5f6
7 changed files with 39 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
patches/ntdll-Junction_Points/0006-kernel32-Advertise-junction-point-support.patch
View File

@ -1,42 +1,18 @@
From bb018ca21a1ddf8c1bae06c0312dc72f4d2b381e Mon Sep 17 00:00:00 2001
From d8910a4f11afbe0299fffcde6ca34fcfdb86f9c0 Mon Sep 17 00:00:00 2001
From: "Erich E. Hoover" <erich.e.hoover@wine-staging.com>
Date: Sat, 12 Dec 2020 17:28:31 -0700
Subject: [PATCH] kernel32: Advertise junction point support.
---
dlls/mountmgr.sys/device.c | 83 +++++++++++++++++++++++++++++++++++++-
dlls/ntdll/tests/file.c | 9 ++++-
2 files changed, 89 insertions(+), 3 deletions(-)
dlls/mountmgr.sys/device.c | 66 +++++++++++++++++++++++++++++++++++++-
dlls/ntdll/tests/file.c | 9 ++++--
2 files changed, 72 insertions(+), 3 deletions(-)
diff --git a/dlls/mountmgr.sys/device.c b/dlls/mountmgr.sys/device.c
index d4f77012bbe..bb53d5fa3b2 100644
index d4f77012bbe..5cb133ebecd 100644
--- a/dlls/mountmgr.sys/device.c
+++ b/dlls/mountmgr.sys/device.c
@@ -23,6 +23,23 @@
#include <stdarg.h>
#include <stdio.h>
#include <stdlib.h>
+#if 0 /* These need to be moved to the unixlib */
+#ifdef HAVE_SYS_STATFS_H
+# include <sys/statfs.h>
+#endif
+#ifdef HAVE_SYS_SYSCALL_H
+# include <sys/syscall.h>
+#endif
+#ifdef HAVE_SYS_VFS_H
+# include <sys/vfs.h>
+#endif
+#ifdef HAVE_SYS_PARAM_H
+#include <sys/param.h>
+#endif
+#ifdef HAVE_SYS_MOUNT_H
+#include <sys/mount.h>
+#endif
+#endif
#define NONAMELESSUNION
@@ -1615,6 +1632,69 @@ static NTSTATUS query_property( struct disk_device *device, IRP *irp )
@@ -1615,6 +1615,69 @@ static NTSTATUS query_property( struct disk_device *device, IRP *irp )
return status;
}
@ -106,7 +82,7 @@ index d4f77012bbe..bb53d5fa3b2 100644
static NTSTATUS WINAPI harddisk_query_volume( DEVICE_OBJECT *device, IRP *irp )
{
IO_STACK_LOCATION *irpsp = IoGetCurrentIrpStackLocation( irp );
@@ -1695,7 +1775,8 @@ static NTSTATUS WINAPI harddisk_query_volume( DEVICE_OBJECT *device, IRP *irp )
@@ -1695,7 +1758,8 @@ static NTSTATUS WINAPI harddisk_query_volume( DEVICE_OBJECT *device, IRP *irp )
break;
default:
fsname = L"NTFS";

4
patches/patchinstall.sh
View File

@ -51,7 +51,7 @@ usage()
# Get the upstream commit sha
upstream_commit()
{
echo "f374e9ccc8c9b9933520d006b879495bde4e7bb3"
echo "c0ea1ad37d3343c403d80ee18bf0d90c2699148b"
}
# Show version information
@ -2539,7 +2539,7 @@ fi
# | * [#39793] Do a device check before returning a default serial port name
# |
# | Modified files:
# | * dlls/mountmgr.sys/device.c
# | * dlls/mountmgr.sys/device.c, dlls/mountmgr.sys/unixlib.c, dlls/mountmgr.sys/unixlib.h
# |
if test "$enable_ntdll_Serial_Port_Detection" -eq 1; then
patch_apply ntdll-Serial_Port_Detection/0001-ntdll-Do-a-device-check-before-returning-a-default-s.patch

12
patches/user32-rawinput-mouse/0004-winex11.drv-Keep-track-of-pointer-and-device-button-.patch
View File

@ -1,7 +1,7 @@
From 36e0b9f5b0b0ecb9de225dd3b1f092c99a1837f4 Mon Sep 17 00:00:00 2001
From 1687b01c234b57803be7099f81ccce2136642670 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Bernon?= <rbernon@codeweavers.com>
Date: Thu, 19 Dec 2019 22:34:44 +0100
Subject: [PATCH 4/8] winex11.drv: Keep track of pointer and device button
Subject: [PATCH] winex11.drv: Keep track of pointer and device button
mappings.
We are going to receive raw button events and we will need to apply the
@ -196,10 +196,10 @@ index 9088aada596..6905d0827f8 100644
xinput2_available = XQueryExtension( gdi_display, "XInputExtension", &xinput2_opcode, &event, &error );
diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h
index 463c2027077..f7af7f346e5 100644
index 8cddfa05904..b8d1bb100de 100644
--- a/dlls/winex11.drv/x11drv.h
+++ b/dlls/winex11.drv/x11drv.h
@@ -642,6 +642,7 @@ extern void retry_grab_clipping_window(void) DECLSPEC_HIDDEN;
@@ -698,6 +698,7 @@ extern void retry_grab_clipping_window(void) DECLSPEC_HIDDEN;
extern BOOL clip_fullscreen_window( HWND hwnd, BOOL reset ) DECLSPEC_HIDDEN;
extern void move_resize_window( HWND hwnd, int dir ) DECLSPEC_HIDDEN;
extern void X11DRV_InitKeyboard( Display *display ) DECLSPEC_HIDDEN;
@ -208,7 +208,7 @@ index 463c2027077..f7af7f346e5 100644
DWORD mask, DWORD flags ) DECLSPEC_HIDDEN;
diff --git a/dlls/winex11.drv/x11drv_main.c b/dlls/winex11.drv/x11drv_main.c
index 98f57383bc2..2a35a6a8548 100644
index d8e2a88c5f6..21437d99c5c 100644
--- a/dlls/winex11.drv/x11drv_main.c
+++ b/dlls/winex11.drv/x11drv_main.c
@@ -629,6 +629,7 @@ static BOOL process_attach(void)
@ -218,7 +218,7 @@ index 98f57383bc2..2a35a6a8548 100644
+ X11DRV_InitMouse( gdi_display );
if (use_xim) use_xim = X11DRV_InitXIM( input_style );
X11DRV_DisplayDevices_Init(FALSE);
init_user_driver();
--
2.33.0

8
patches/windows.networking.connectivity-new-dll/0001-include-Add-windows.networking.connectivity.idl.patch
View File

@ -1,4 +1,4 @@
From 47ca467e3697bb01ee996a1cf8d5ed94227cbbc2 Mon Sep 17 00:00:00 2001
From a5d61672e671ca208fb51fd227566179128bc888 Mon Sep 17 00:00:00 2001
From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
Date: Fri, 28 May 2021 12:34:37 +1000
Subject: [PATCH] include: Add windows.networking.connectivity.idl
@ -10,12 +10,12 @@ Subject: [PATCH] include: Add windows.networking.connectivity.idl
create mode 100644 include/windows.networking.connectivity.idl
diff --git a/include/Makefile.in b/include/Makefile.in
index d3856fc76e6..db74ceb8376 100644
index a1bf9fbd594..e379070caa9 100644
--- a/include/Makefile.in
+++ b/include/Makefile.in
@@ -784,6 +784,7 @@ SOURCES = \
windows.h \
@@ -786,6 +786,7 @@ SOURCES = \
windows.media.devices.idl \
windows.media.idl \
windows.media.speechsynthesis.idl \
+ windows.networking.connectivity.idl \
windows.storage.streams.idl \

8
patches/windows.networking.connectivity-new-dll/0002-include-Add-windows.networking.idl.patch
View File

@ -1,4 +1,4 @@
From be391f20312e3b9e6460e9e3513b2c9de8c28799 Mon Sep 17 00:00:00 2001
From e98050400335c07a044c28774c802647ff075af5 Mon Sep 17 00:00:00 2001
From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
Date: Tue, 1 Jun 2021 10:26:28 +1000
Subject: [PATCH] include: Add windows.networking.idl
@ -10,12 +10,12 @@ Subject: [PATCH] include: Add windows.networking.idl
create mode 100644 include/windows.networking.idl
diff --git a/include/Makefile.in b/include/Makefile.in
index db74ceb8376..a16cba52642 100644
index e379070caa9..043f1436216 100644
--- a/include/Makefile.in
+++ b/include/Makefile.in
@@ -784,6 +784,7 @@ SOURCES = \
windows.h \
@@ -786,6 +786,7 @@ SOURCES = \
windows.media.devices.idl \
windows.media.idl \
windows.media.speechsynthesis.idl \
+ windows.networking.idl \
windows.networking.connectivity.idl \

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

@ -1,4 +1,4 @@
From 40af1acfcc95f7aeef48b6b57338a9365946af33 Mon Sep 17 00:00:00 2001
From c4ea95ba65062d383c7635ce79bea2e21ca1ef8a 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 | 4 ++-
7 files changed, 92 insertions(+), 2 deletions(-)
include/wine/gdi_driver.h | 2 ++
7 files changed, 91 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 0b386b0af21..f979630c707 100644
index 9ff676aca22..747e1d55533 100644
--- a/dlls/user32/driver.c
+++ b/dlls/user32/driver.c
@@ -362,6 +362,11 @@ static BOOL CDECL loaderdrv_UpdateLayeredWindow( HWND hwnd, const UPDATELAYEREDW
@@ -321,6 +321,11 @@ static BOOL CDECL loaderdrv_UpdateLayeredWindow( HWND hwnd, const UPDATELAYEREDW
return load_driver()->pUpdateLayeredWindow( hwnd, info, window_rect );
}
@ -71,7 +71,7 @@ index 0b386b0af21..f979630c707 100644
static struct user_driver_funcs lazy_load_driver =
{
{ NULL },
@@ -413,6 +418,8 @@ static struct user_driver_funcs lazy_load_driver =
@@ -373,6 +378,8 @@ static struct user_driver_funcs lazy_load_driver =
nulldrv_WindowPosChanged,
/* system parameters */
nulldrv_SystemParametersInfo,
@ -81,10 +81,10 @@ index 0b386b0af21..f979630c707 100644
nulldrv_ThreadDetach
};
diff --git a/dlls/win32u/driver.c b/dlls/win32u/driver.c
index 15e7d3701f7..bcca0c30353 100644
index 93c2ff1da4c..f63da32561a 100644
--- a/dlls/win32u/driver.c
+++ b/dlls/win32u/driver.c
@@ -986,6 +986,10 @@ static BOOL CDECL nulldrv_SystemParametersInfo( UINT action, UINT int_param, voi
@@ -991,6 +991,10 @@ static BOOL CDECL nulldrv_SystemParametersInfo( UINT action, UINT int_param, voi
return FALSE;
}
@ -95,7 +95,7 @@ index 15e7d3701f7..bcca0c30353 100644
static void CDECL nulldrv_ThreadDetach( void )
{
}
@@ -1072,6 +1076,7 @@ void CDECL __wine_set_display_driver( struct user_driver_funcs *driver, UINT ver
@@ -1129,6 +1133,7 @@ void CDECL __wine_set_display_driver( struct user_driver_funcs *driver, UINT ver
SET_USER_FUNC(WindowPosChanging);
SET_USER_FUNC(WindowPosChanged);
SET_USER_FUNC(SystemParametersInfo);
@ -104,10 +104,10 @@ index 15e7d3701f7..bcca0c30353 100644
#undef SET_USER_FUNC
diff --git a/dlls/winex11.drv/init.c b/dlls/winex11.drv/init.c
index 854221bf948..c9bef8d46d2 100644
index 1a86836b9c1..d9bdd2b6e3f 100644
--- a/dlls/winex11.drv/init.c
+++ b/dlls/winex11.drv/init.c
@@ -425,6 +425,7 @@ static const struct user_driver_funcs x11drv_funcs =
@@ -429,6 +429,7 @@ static const struct user_driver_funcs x11drv_funcs =
.pWindowPosChanging = X11DRV_WindowPosChanging,
.pWindowPosChanged = X11DRV_WindowPosChanged,
.pSystemParametersInfo = X11DRV_SystemParametersInfo,
@ -116,10 +116,10 @@ index 854221bf948..c9bef8d46d2 100644
};
diff --git a/dlls/winex11.drv/x11drv.h b/dlls/winex11.drv/x11drv.h
index 4b4ee8daaeb..182ca4dd857 100644
index ce9a254fb5b..9b6d83ae4f3 100644
--- a/dlls/winex11.drv/x11drv.h
+++ b/dlls/winex11.drv/x11drv.h
@@ -240,6 +240,7 @@ extern void CDECL X11DRV_WindowPosChanged( HWND hwnd, HWND insert_after, UINT sw
@@ -242,6 +242,7 @@ extern void CDECL X11DRV_WindowPosChanged( HWND hwnd, HWND insert_after, UINT sw
struct window_surface *surface ) DECLSPEC_HIDDEN;
extern BOOL CDECL X11DRV_SystemParametersInfo( UINT action, UINT int_param, void *ptr_param,
UINT flags ) DECLSPEC_HIDDEN;
@ -231,19 +231,10 @@ index 3994c2106cc..ec943dcd623 100644
return xic;
}
diff --git a/include/wine/gdi_driver.h b/include/wine/gdi_driver.h
index 994b082d5b4..e65b1873926 100644
index b8e088282e5..dcf11f240d4 100644
--- a/include/wine/gdi_driver.h
+++ b/include/wine/gdi_driver.h
@@ -167,7 +167,7 @@ struct gdi_dc_funcs
};
/* increment this when you change the DC function table */
-#define WINE_GDI_DRIVER_VERSION 70
+#define WINE_GDI_DRIVER_VERSION 71
#define GDI_PRIORITY_NULL_DRV 0 /* null driver */
#define GDI_PRIORITY_FONT_DRV 100 /* any font driver */
@@ -285,6 +285,8 @@ struct user_driver_funcs
@@ -322,6 +322,8 @@ struct user_driver_funcs
const RECT *,struct window_surface*);
/* system parameters */
BOOL (CDECL *pSystemParametersInfo)(UINT,UINT,void*,UINT);

2
staging/upstream-commit
View File

@ -1 +1 @@
f374e9ccc8c9b9933520d006b879495bde4e7bb3
c0ea1ad37d3343c403d80ee18bf0d90c2699148b