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

Browse Source
This commit is contained in:
Alistair Leslie-Hughes 2022-04-26 13:50:30 +10:00
parent 9df73ee345
commit 9d853b7c44
7 changed files with 44 additions and 42 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
patches/Pipelight/0004-winex11.drv-Indicate-direct-rendering-through-OpenGL.patch
View File

@ -1,17 +1,18 @@
From 7d77edaea3c4ba8067e4b73034df5c58940daebc Mon Sep 17 00:00:00 2001
From a9cf27a493697c97249ce526483d25c871c053c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Sun, 1 Jun 2014 22:51:32 +0200
Subject: winex11.drv: Indicate direct rendering through OpenGL extension
Subject: [PATCH] winex11.drv: Indicate direct rendering through OpenGL
extension
---
dlls/winex11.drv/opengl.c | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
dlls/winex11.drv/opengl.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/dlls/winex11.drv/opengl.c b/dlls/winex11.drv/opengl.c
index 71af3db..966d32d 100644
index 92555841f71..71e7ecbcf7c 100644
--- a/dlls/winex11.drv/opengl.c
+++ b/dlls/winex11.drv/opengl.c
@@ -440,6 +440,7 @@ static int GLXErrorHandler(Display *dpy,
@@ -410,6 +410,7 @@ static int GLXErrorHandler(Display *dpy, XErrorEvent *event, void *arg)
static BOOL X11DRV_WineGL_InitOpenglInfo(void)
{
static const char legacy_extensions[] = " WGL_EXT_extensions_string WGL_EXT_swap_control";
@ -19,14 +20,14 @@ index 71af3db..966d32d 100644
int screen = DefaultScreen(gdi_display);
Window win = 0, root = 0;
@@ -493,16 +494,18 @@ static BOOL X11DRV_WineGL_InitOpenglInfo
@@ -465,16 +466,18 @@ static BOOL X11DRV_WineGL_InitOpenglInfo(void)
}
gl_renderer = (const char *)opengl_funcs.gl.p_glGetString(GL_RENDERER);
gl_version = (const char *)opengl_funcs.gl.p_glGetString(GL_VERSION);
+ glx_direct = pglXIsDirect(gdi_display, ctx);
str = (const char *) opengl_funcs.gl.p_glGetString(GL_EXTENSIONS);
- glExtensions = HeapAlloc(GetProcessHeap(), 0, strlen(str)+sizeof(legacy_extensions));
+ glExtensions = HeapAlloc(GetProcessHeap(), 0, strlen(str)+sizeof(legacy_extensions)+sizeof(direct_extension));
- glExtensions = malloc( strlen(str) + sizeof(legacy_extensions) );
+ glExtensions = malloc( strlen(str)+sizeof(legacy_extensions)+sizeof(direct_extension) );
strcpy(glExtensions, str);
strcat(glExtensions, legacy_extensions);
+ if (glx_direct)
@ -41,4 +42,5 @@ index 71af3db..966d32d 100644
TRACE("GL version : %s.\n", gl_version);
TRACE("GL renderer : %s.\n", gl_renderer);
--
1.7.9.5
2.35.1

20
patches/libs-Unicode_Collation/0001-kernelbase-Implement-sortkey-generation-on-official-.patch
View File

@ -1,4 +1,4 @@
From 9b66229c8a8857e4dfbcee80698b83ca0ca7f2f9 Mon Sep 17 00:00:00 2001
From b052dd526d176c8b842f446279ee78542b184f08 Mon Sep 17 00:00:00 2001
From: Fabian Maurer <dark.shadow4@web.de>
Date: Fri, 10 Apr 2020 18:47:18 +0200
Subject: [PATCH] kernelbase: Implement sortkey generation on official tables
@ -10,10 +10,10 @@ Signed-off-by: Fabian Maurer <dark.shadow4@web.de>
2 files changed, 413 insertions(+), 123 deletions(-)
diff --git a/dlls/kernel32/tests/locale.c b/dlls/kernel32/tests/locale.c
index 3b43dea2a2b..ac9b4da0d67 100644
index 8dc5814162a..d6084e3f328 100644
--- a/dlls/kernel32/tests/locale.c
+++ b/dlls/kernel32/tests/locale.c
@@ -2568,6 +2568,13 @@ static void test_lcmapstring_unicode(lcmapstring_wrapper func_ptr, const char *f
@@ -2586,6 +2586,13 @@ static void test_lcmapstring_unicode(lcmapstring_wrapper func_ptr, const char *f
lstrlenW(symbols_stripped) + 1, ret);
ok(!lstrcmpW(buf, symbols_stripped), "%s string comparison mismatch\n", func_name);
@ -27,7 +27,7 @@ index 3b43dea2a2b..ac9b4da0d67 100644
/* test srclen = 0 */
SetLastError(0xdeadbeef);
ret = func_ptr(0, upper_case, 0, buf, ARRAY_SIZE(buf));
@@ -3101,6 +3108,135 @@ static void test_sorting(void)
@@ -3222,6 +3229,135 @@ static void test_sorting(void)
}
}
@ -163,7 +163,7 @@ index 3b43dea2a2b..ac9b4da0d67 100644
static void test_FoldStringA(void)
{
int ret, i, j;
@@ -7492,6 +7628,7 @@ START_TEST(locale)
@@ -7649,6 +7785,7 @@ START_TEST(locale)
test_locale_nls();
test_geo_name();
test_sorting();
@ -172,10 +172,10 @@ index 3b43dea2a2b..ac9b4da0d67 100644
test_EnumCalendarInfoW();
test_EnumCalendarInfoExA();
diff --git a/dlls/kernelbase/locale.c b/dlls/kernelbase/locale.c
index 997c7b6f4bc..e494fe6bb48 100644
index d046cefd749..993ac707a55 100644
--- a/dlls/kernelbase/locale.c
+++ b/dlls/kernelbase/locale.c
@@ -2857,127 +2857,6 @@ static int wcstombs_codepage( UINT codepage, DWORD flags, const WCHAR *src, int
@@ -3048,127 +3048,6 @@ static int wcstombs_codepage( const CPTABLEINFO *info, DWORD flags, const WCHAR
return wcstombs_sbcs( info, src, srclen, dst, dstlen );
}
@ -301,9 +301,9 @@ index 997c7b6f4bc..e494fe6bb48 100644
-
-
/* compose a full-width katakana. return consumed source characters. */
static int compose_katakana( const WCHAR *src, int srclen, WCHAR *dst )
static int map_to_fullwidth( const WCHAR *src, int srclen, WCHAR *dst )
{
@@ -3305,6 +3184,280 @@ static int compare_weights(int flags, const WCHAR *str1, int len1,
@@ -3358,6 +3237,280 @@ static int compare_weights(int flags, const WCHAR *str1, int len1,
return len1 - len2;
}
@ -584,7 +584,7 @@ index 997c7b6f4bc..e494fe6bb48 100644
static int compare_tzdate( const TIME_FIELDS *tf, const SYSTEMTIME *compare )
{
@@ -5759,8 +5912,8 @@ INT WINAPI DECLSPEC_HOTPATCH LCMapStringEx( const WCHAR *locale, DWORD flags, co
@@ -5713,8 +5866,8 @@ INT WINAPI DECLSPEC_HOTPATCH LCMapStringEx( const WCHAR *locale, DWORD flags, co
TRACE( "(%s,0x%08lx,%s,%d,%p,%d)\n",
debugstr_w(locale), flags, debugstr_wn(src, srclen), srclen, dst, dstlen );

2
patches/patchinstall.sh
View File

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

26
patches/user32-Mouse_Message_Hwnd/0005-server-Add-support-for-a-layered-window-region.-v2.patch
View File

@ -1,4 +1,4 @@
From 484817725cd42363fb9c952a1661c4332ac5d633 Mon Sep 17 00:00:00 2001
From 54065eb714959facb7f4d463d9c8a11e5c6b2b42 Mon Sep 17 00:00:00 2001
From: Dmitry Timoshkov <dmitry@baikal.ru>
Date: Wed, 17 May 2017 23:55:55 +0800
Subject: [PATCH] server: Add support for a layered window region. (v3)
@ -11,7 +11,7 @@ Subject: [PATCH] server: Add support for a layered window region. (v3)
4 files changed, 84 insertions(+), 2 deletions(-)
diff --git a/dlls/user32/tests/input.c b/dlls/user32/tests/input.c
index fe832f4e00c..9b764d2c985 100644
index e15de7e5ccd..568fd26bb69 100644
--- a/dlls/user32/tests/input.c
+++ b/dlls/user32/tests/input.c
@@ -3695,13 +3695,11 @@ static void test_Input_mouse(void)
@ -29,7 +29,7 @@ index fe832f4e00c..9b764d2c985 100644
got_button_up = TRUE;
break;
diff --git a/dlls/winex11.drv/bitblt.c b/dlls/winex11.drv/bitblt.c
index bae0784be78..158c716d052 100644
index 550c5f06f37..8204e3dba9e 100644
--- a/dlls/winex11.drv/bitblt.c
+++ b/dlls/winex11.drv/bitblt.c
@@ -46,6 +46,7 @@
@ -98,7 +98,7 @@ index bae0784be78..158c716d052 100644
}
@@ -1751,6 +1795,7 @@ static void update_surface_region( struct x11drv_window_surface *surface )
HeapFree( GetProcessHeap(), 0, data );
free( data );
}
+ set_layer_region( surface, rgn );
@ -106,10 +106,10 @@ index bae0784be78..158c716d052 100644
#endif
}
diff --git a/server/protocol.def b/server/protocol.def
index d9bed6855e9..933e2185ba4 100644
index 438bbce902b..a4f22aa85de 100644
--- a/server/protocol.def
+++ b/server/protocol.def
@@ -2501,6 +2501,13 @@ enum coords_relative
@@ -2503,6 +2503,13 @@ enum coords_relative
@END
@ -124,7 +124,7 @@ index d9bed6855e9..933e2185ba4 100644
@REQ(get_update_region)
user_handle_t window; /* handle to the window */
diff --git a/server/window.c b/server/window.c
index 7675cd1103d..21475ffdae0 100644
index ce1574260b6..34d1e7af979 100644
--- a/server/window.c
+++ b/server/window.c
@@ -71,6 +71,7 @@ struct window
@ -135,7 +135,7 @@ index 7675cd1103d..21475ffdae0 100644
struct region *update_region; /* update region (relative to window rect) */
unsigned int style; /* window style */
unsigned int ex_style; /* window extended style */
@@ -560,6 +561,7 @@ static struct window *create_window( struct window *parent, struct window *owner
@@ -561,6 +562,7 @@ static struct window *create_window( struct window *parent, struct window *owner
win->atom = atom;
win->last_active = win->handle;
win->win_region = NULL;
@ -143,7 +143,7 @@ index 7675cd1103d..21475ffdae0 100644
win->update_region = NULL;
win->style = 0;
win->ex_style = 0;
@@ -803,6 +805,9 @@ static int is_point_in_window( struct window *win, int *x, int *y, unsigned int
@@ -804,6 +806,9 @@ static int is_point_in_window( struct window *win, int *x, int *y, unsigned int
if (win->win_region &&
!point_in_region( win->win_region, *x - win->window_rect.left, *y - win->window_rect.top ))
return 0; /* not in window region */
@ -153,7 +153,7 @@ index 7675cd1103d..21475ffdae0 100644
return 1;
}
@@ -1948,6 +1953,14 @@ static void set_window_region( struct window *win, struct region *region, int re
@@ -1949,6 +1954,14 @@ static void set_window_region( struct window *win, struct region *region, int re
}
@ -168,7 +168,7 @@ index 7675cd1103d..21475ffdae0 100644
/* destroy a window */
void free_window_handle( struct window *win )
{
@@ -2011,6 +2024,7 @@ void free_window_handle( struct window *win )
@@ -2012,6 +2025,7 @@ void free_window_handle( struct window *win )
detach_window_thread( win );
if (win->parent) set_parent_window( win, NULL );
@ -176,7 +176,7 @@ index 7675cd1103d..21475ffdae0 100644
free_user_handle( win->handle );
win->handle = 0;
release_object( win );
@@ -2672,6 +2686,24 @@ DECL_HANDLER(set_window_region)
@@ -2673,6 +2687,24 @@ DECL_HANDLER(set_window_region)
}
@ -202,5 +202,5 @@ index 7675cd1103d..21475ffdae0 100644
DECL_HANDLER(get_update_region)
{
--
2.34.1
2.35.1

2
patches/user32-msgbox-Support-WM_COPY-mesg/0001-user32-msgbox-Support-WM_COPY-Message.patch
View File

@ -106,7 +106,7 @@ index 3da1c0a3445..b29af2161b6 100644
+ GlobalUnlock(hMem);
+
+ OpenClipboard(hwnd);
+ EmptyClipboard();
+ NtUserEmptyClipboard();
+ SetClipboardData(CF_UNICODETEXT, hMem);
+ NtUserCloseClipboard();
+ }

12
patches/windows.networking.connectivity-new-dll/0003-windows.networking.connectivity-Add-stub-dll.patch
View File

@ -1,7 +1,7 @@
From a446063a84d5b48ac4c8aa05abca98da8a386467 Mon Sep 17 00:00:00 2001
From 417cc7a6b991c2fab85bb37609f7a7cc286174e1 Mon Sep 17 00:00:00 2001
From: Esdras Tarsis <esdrastarsis@gmail.com>
Date: Wed, 2 Sep 2020 23:41:19 -0300
Subject: [PATCH 3/8] windows.networking.connectivity: Add stub dll.
Subject: [PATCH] windows.networking.connectivity: Add stub dll.
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=46534
Signed-off-by: Esdras Tarsis <esdrastarsis@gmail.com>
@ -16,13 +16,13 @@ Signed-off-by: Esdras Tarsis <esdrastarsis@gmail.com>
create mode 100644 dlls/windows.networking.connectivity/windows.networking.connectivity_main.c
diff --git a/configure.ac b/configure.ac
index 7ea0d824cee..e8d0d8a9023 100644
index 280882ecb57..b27930474a9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3775,6 +3775,7 @@ WINE_CONFIG_MAKEFILE(dlls/windows.media.devices)
WINE_CONFIG_MAKEFILE(dlls/windows.media.devices/tests)
@@ -3147,6 +3147,7 @@ WINE_CONFIG_MAKEFILE(dlls/windows.media.devices/tests)
WINE_CONFIG_MAKEFILE(dlls/windows.media.speech)
WINE_CONFIG_MAKEFILE(dlls/windows.media.speech/tests)
WINE_CONFIG_MAKEFILE(dlls/windows.networking)
+WINE_CONFIG_MAKEFILE(dlls/windows.networking.connectivity)
WINE_CONFIG_MAKEFILE(dlls/windowscodecs)
WINE_CONFIG_MAKEFILE(dlls/windowscodecs/tests)
@ -93,5 +93,5 @@ index 00000000000..96ff0ea5af2
+}
\ No newline at end of file
--
2.30.2
2.35.1

2
staging/upstream-commit
View File

@ -1 +1 @@
43fe980818d93e8f407eb6447aaf7eb4381c3cee
7af93f497c3e71f69511743f42b86b2ef5e13b32