mirror of
https://gitlab.winehq.org/wine/wine-staging.git
synced 2025-01-28 22:04:43 -08:00
Updated mailing-list-patches
This commit is contained in:
Alistair Leslie-Hughes
parent
a67dca35a1
commit
9fd7972c2b
@ -0,0 +1,40 @@
|
||||
From 2d1a3062bcb0e0716168c75b9c4ccef17189a47d Mon Sep 17 00:00:00 2001
|
||||
From: Peter Dons Tychsen <pdt@dontech.dk>
|
||||
Date: Sun, 21 Jul 2019 23:38:02 +0200
|
||||
Subject: [PATCH] msvcrt: Do not use casting in min/max macros
|
||||
|
||||
Macros like ULLONG_MAX are meant to be able to be used in macro conditionals like "#if (UULONG_MAX >= 1)". This is not possible as there are casts in them currently which of course the preprocessor cannot parse.
|
||||
|
||||
Fix this by using type prefixes instead which the preprocessor does understand.
|
||||
This makes libraries like "libtom" compile with Wine headers.
|
||||
|
||||
Signed-off-by: Peter Dons Tychsen <pdt@dontech.dk>
|
||||
---
|
||||
include/msvcrt/limits.h | 8 ++++----
|
||||
1 file changed, 4 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/include/msvcrt/limits.h b/include/msvcrt/limits.h
|
||||
index 13bab8679ba..8d3a0387cd3 100644
|
||||
--- a/include/msvcrt/limits.h
|
||||
+++ b/include/msvcrt/limits.h
|
||||
@@ -30,13 +30,13 @@
|
||||
#define LONG_MAX 0x7fffffffL
|
||||
#define ULONG_MAX 0xffffffffUL
|
||||
|
||||
-#define LLONG_MAX (((__int64)0x7fffffff << 32) | 0xffffffff)
|
||||
+#define LLONG_MAX ((0x7fffffffLL << 32) | 0xffffffff)
|
||||
#define LLONG_MIN (-LLONG_MAX-1)
|
||||
-#define ULLONG_MAX (((unsigned __int64)0xffffffff << 32) | 0xffffffff)
|
||||
+#define ULLONG_MAX ((0xffffffffULL << 32) | 0xffffffff)
|
||||
|
||||
-#define _I64_MAX (((__int64)0x7fffffff << 32) | 0xffffffff)
|
||||
+#define _I64_MAX ((0x7fffffffLL << 32) | 0xffffffff)
|
||||
#define _I64_MIN (-_I64_MAX-1)
|
||||
-#define _UI64_MAX (((unsigned __int64)0xffffffff << 32) | 0xffffffff)
|
||||
+#define _UI64_MAX ((0xffffffffULL << 32) | 0xffffffff)
|
||||
|
||||
#define I64_MIN _I64_MIN
|
||||
#define I64_MAX _I64_MAX
|
||||
--
|
||||
2.17.1
|
||||
|
||||
@ -0,0 +1,50 @@
|
||||
From 280871d857de266e36e5ddbbe71acb4672fd40ed Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?R=C3=A9mi=20Bernon?= <rbernon@codeweavers.com>
|
||||
Date: Mon, 22 Jul 2019 16:55:01 +0200
|
||||
Subject: [PATCH] winex11.drv: Ignore XGrabPointer-induced warp events as well
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Sometimes the last of the induced PointerMotion events slips through the
|
||||
warp_serial filter and trigger spurious mouse motion. This is the case
|
||||
in Fallout 4, which alternates between fullscreen and smaller cursor
|
||||
clip rectangles.
|
||||
|
||||
Signed-off-by: Rémi Bernon <rbernon@codeweavers.com>
|
||||
---
|
||||
dlls/winex11.drv/mouse.c | 11 ++++++-----
|
||||
1 file changed, 6 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/dlls/winex11.drv/mouse.c b/dlls/winex11.drv/mouse.c
|
||||
index b9eaaab2098..4fd265b9816 100644
|
||||
--- a/dlls/winex11.drv/mouse.c
|
||||
+++ b/dlls/winex11.drv/mouse.c
|
||||
@@ -415,11 +415,6 @@ static BOOL grab_clipping_window( const RECT *clip )
|
||||
max( 1, clip->right - clip->left ), max( 1, clip->bottom - clip->top ) );
|
||||
XMapWindow( data->display, clip_window );
|
||||
|
||||
- /* if the rectangle is shrinking we may get a pointer warp */
|
||||
- if (!data->clip_hwnd || clip->left > clip_rect.left || clip->top > clip_rect.top ||
|
||||
- clip->right < clip_rect.right || clip->bottom < clip_rect.bottom)
|
||||
- data->warp_serial = NextRequest( data->display );
|
||||
-
|
||||
if (!XGrabPointer( data->display, clip_window, False,
|
||||
PointerMotionMask | ButtonPressMask | ButtonReleaseMask,
|
||||
GrabModeAsync, GrabModeAsync, clip_window, None, CurrentTime ))
|
||||
@@ -431,6 +426,12 @@ static BOOL grab_clipping_window( const RECT *clip )
|
||||
DestroyWindow( msg_hwnd );
|
||||
return FALSE;
|
||||
}
|
||||
+
|
||||
+ /* if the rectangle is shrinking we may get a pointer warp */
|
||||
+ if (!data->clip_hwnd || clip->left > clip_rect.left || clip->top > clip_rect.top ||
|
||||
+ clip->right < clip_rect.right || clip->bottom < clip_rect.bottom)
|
||||
+ data->warp_serial = NextRequest( data->display );
|
||||
+
|
||||
clip_rect = *clip;
|
||||
if (!data->clip_hwnd) sync_window_cursor( clip_window );
|
||||
InterlockedExchangePointer( (void **)&cursor_window, msg_hwnd );
|
||||
--
|
||||
2.17.1
|
||||
|
||||
@ -2063,9 +2063,9 @@ fi
|
||||
# | dlls/shell32/Makefile.in, dlls/shell32/shell32.spec, dlls/shell32/shlfileop.c, dlls/strmbase/strmbase_private.h,
|
||||
# | dlls/user32/rawinput.c, dlls/user32/tests/input.c, dlls/winebus.sys/bus.h, dlls/winebus.sys/bus_iohid.c,
|
||||
# | dlls/winebus.sys/bus_sdl.c, dlls/winebus.sys/bus_udev.c, dlls/winebus.sys/main.c, dlls/winex11.drv/display.c,
|
||||
# | include/Makefile.in, include/d3drm.h, include/d3drmobj.h, include/strongname.h, loader/Makefile.in, loader/wine.inf.in,
|
||||
# | loader/winebus.inf.in, programs/services/services.c, programs/wineboot/Makefile.in, programs/wineboot/wineboot.c,
|
||||
# | tools/make_specfiles
|
||||
# | dlls/winex11.drv/mouse.c, include/Makefile.in, include/d3drm.h, include/d3drmobj.h, include/msvcrt/limits.h,
|
||||
# | include/strongname.h, loader/Makefile.in, loader/wine.inf.in, loader/winebus.inf.in, programs/services/services.c,
|
||||
# | programs/wineboot/Makefile.in, programs/wineboot/wineboot.c, tools/make_specfiles
|
||||
# |
|
||||
if test "$enable_mailing_list_patches" -eq 1; then
|
||||
patch_apply mailing-list-patches/0001-winebus.inf-Add-new-INF-file-and-copy-it-to-the-INF-.patch
|
||||
@ -2101,6 +2101,8 @@ if test "$enable_mailing_list_patches" -eq 1; then
|
||||
patch_apply mailing-list-patches/0031-winex11.drv-Add-DriverDateData-registry-property-to-.patch
|
||||
patch_apply mailing-list-patches/0032-dxgi-Obey-image-count-limits-for-Vulkan-swapchains.patch
|
||||
patch_apply mailing-list-patches/0033-services-Fix-the-arguments-to-is_root_pnp_service.patch
|
||||
patch_apply mailing-list-patches/0034-msvcrt-Do-not-use-casting-in-min-max-macros.patch
|
||||
patch_apply mailing-list-patches/0035-winex11.drv-Ignore-XGrabPointer-induced-warp-events-.patch
|
||||
(
|
||||
printf '%s\n' '+ { "Zebediah Figura", "winebus.inf: Add new INF file and copy it to the INF directory.", 1 },';
|
||||
printf '%s\n' '+ { "Zebediah Figura", "winebus.sys: Implement AddDevice().", 1 },';
|
||||
@ -2135,6 +2137,8 @@ if test "$enable_mailing_list_patches" -eq 1; then
|
||||
printf '%s\n' '+ { "Zhiyi Zhang", "winex11.drv: Add DriverDateData registry property to display adapters.", 1 },';
|
||||
printf '%s\n' '+ { "Józef Kucia", "dxgi: Obey image count limits for Vulkan swapchains.", 1 },';
|
||||
printf '%s\n' '+ { "Zebediah Figura", "services: Fix the arguments to is_root_pnp_service().", 1 },';
|
||||
printf '%s\n' '+ { "Peter Dons Tychsen", "msvcrt: Do not use casting in min/max macros.", 1 },';
|
||||
printf '%s\n' '+ { "Rémi Bernon", "winex11.drv: Ignore XGrabPointer-induced warp events as well.", 1 },';
|
||||
) >> "$patchlist"
|
||||
fi
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user