wine/wine-staging
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-staging.git synced 2024-09-13 09:17:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

Rebase against de66ea9df6746917cada71d2c27b5cc38cbdd2f0.

Browse Source
This commit is contained in:
Alistair Leslie-Hughes 2023-10-17 10:12:05 +11:00
parent 3dcd383186
commit 7d2672183d
6 changed files with 60 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
patches/msxml3-FreeThreadedXMLHTTP60/0002-msxml3-Implement-FreeThreadedXMLHTTP60.patch
View File

@ -1,4 +1,4 @@
From e11874a28a68cd3cd9c031f475d59435d94aa3fc Mon Sep 17 00:00:00 2001
From b26ba4d86df312d28bc2422ed1e544b058e4aacd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Bernon?= <rbernon@codeweavers.com>
Date: Tue, 8 Sep 2020 18:43:52 +0200
Subject: [PATCH] msxml3: Implement FreeThreadedXMLHTTP60.
@ -16,7 +16,7 @@ Update from Gijs Vermeulen <gijsvrm@gmail.com>
8 files changed, 915 insertions(+), 16 deletions(-)
diff --git a/dlls/msxml3/Makefile.in b/dlls/msxml3/Makefile.in
index 2bf789732da..e2d737599b1 100644
index 7e59a223143..5044c4e2c79 100644
--- a/dlls/msxml3/Makefile.in
+++ b/dlls/msxml3/Makefile.in
@@ -1,5 +1,5 @@
@ -25,7 +25,7 @@ index 2bf789732da..e2d737599b1 100644
+IMPORTS = $(XSLT_PE_LIBS) $(XML2_PE_LIBS) uuid urlmon shlwapi oleaut32 ole32 user32 advapi32 rtworkq
EXTRAINCL = $(XSLT_PE_CFLAGS) $(XML2_PE_CFLAGS)
C_SRCS = \
SOURCES = \
diff --git a/dlls/msxml3/factory.c b/dlls/msxml3/factory.c
index 243ee379712..323c7b49848 100644
--- a/dlls/msxml3/factory.c
@ -1101,5 +1101,5 @@ index 7396826a1f6..b2d8bd3b337 100644
helpstring("XML DOM Document 6.0"),
progid("Msxml2.DOMDocument.6.0"),
--
2.41.0
2.42.0

8
patches/shell32-ACE_Viewer/0002-shell32-Add-security-property-tab.patch
View File

@ -1,4 +1,4 @@
From 4c2973947ad85bbed99b3149462eb73e823c977a Mon Sep 17 00:00:00 2001
From b652c99cce554343ab9a25b9b0c043a7ffdf53f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Mon, 8 May 2017 23:33:45 +0200
Subject: [PATCH] shell32: Add security property tab.
@ -11,7 +11,7 @@ Subject: [PATCH] shell32: Add security property tab.
4 files changed, 438 insertions(+), 1 deletion(-)
diff --git a/dlls/shell32/Makefile.in b/dlls/shell32/Makefile.in
index ad2f8cc0e45..8efcbfb4dbf 100644
index 743df597ee4..9342384b6ba 100644
--- a/dlls/shell32/Makefile.in
+++ b/dlls/shell32/Makefile.in
@@ -1,7 +1,7 @@
@ -22,7 +22,7 @@ index ad2f8cc0e45..8efcbfb4dbf 100644
+IMPORTS = uuid shlwapi user32 gdi32 advapi32 aclui
DELAYIMPORTS = ole32 oleaut32 shdocvw version comctl32 comdlg32 gdiplus
C_SRCS = \
SOURCES = \
diff --git a/dlls/shell32/shell32.rc b/dlls/shell32/shell32.rc
index 264947d337d..90898b7ed98 100644
--- a/dlls/shell32/shell32.rc
@ -515,5 +515,5 @@ index 210046e729d..0f3a64f16d2 100644
#define IDS_RECYCLEBIN_FOLDER_NAME 8964
--
2.40.1
2.42.0

22
patches/widl-SLTG_Typelib_Support/0001-widl-Add-initial-implementation-of-SLTG-typelib-gene.patch
View File

@ -1,4 +1,4 @@
From aa0011513d9570ef49ac7227e4ab4f0b0782020a Mon Sep 17 00:00:00 2001
From 28bf40df3b2fa5b91fc59ed287658cafea46c0d6 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,19 +12,19 @@ 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 32d27060c22..6679f20fd22 100644
index cde27db942c..da6d843b2a8 100644
--- a/tools/widl/Makefile.in
+++ b/tools/widl/Makefile.in
@@ -15,7 +15,8 @@ C_SRCS = \
utils.c \
@@ -21,7 +21,8 @@ SOURCES = \
widl.c \
widl.man.in \
wpp.c \
- write_msft.c
+ write_msft.c \
+ write_sltg.c
LEX_SRCS = \
parser.l \
widl_EXTRADEFS = \
-DINCLUDEDIR="\"${includedir}\"" \
diff --git a/tools/widl/typelib.h b/tools/widl/typelib.h
index 7df7d290825..5d9f45a7c38 100644
--- a/tools/widl/typelib.h
@ -36,10 +36,10 @@ index 7df7d290825..5d9f45a7c38 100644
+extern int create_sltg_typelib(typelib_t *typelib);
#endif
diff --git a/tools/widl/widl.c b/tools/widl/widl.c
index 7b2276b0a41..0d5e4fea456 100644
index e37160e3869..fd701aa1126 100644
--- a/tools/widl/widl.c
+++ b/tools/widl/widl.c
@@ -159,6 +159,7 @@ enum {
@@ -154,6 +154,7 @@ enum {
DLLDATA_ONLY_OPTION,
LOCAL_STUBS_OPTION,
NOSTDINC_OPTION,
@ -47,7 +47,7 @@ index 7b2276b0a41..0d5e4fea456 100644
PREFIX_ALL_OPTION,
PREFIX_CLIENT_OPTION,
PREFIX_SERVER_OPTION,
@@ -185,6 +186,7 @@ static const struct long_option long_options[] = {
@@ -180,6 +181,7 @@ static const struct long_option long_options[] = {
{ "nostdinc", 0, NOSTDINC_OPTION },
{ "ns_prefix", 0, RT_NS_PREFIX },
{ "oldnames", 0, OLDNAMES_OPTION },
@ -55,7 +55,7 @@ index 7b2276b0a41..0d5e4fea456 100644
{ "output", 0, 'o' },
{ "prefix-all", 1, PREFIX_ALL_OPTION },
{ "prefix-client", 1, PREFIX_CLIENT_OPTION },
@@ -645,6 +647,10 @@ static void option_callback( int optc, char *optarg )
@@ -626,6 +628,10 @@ static void option_callback( int optc, char *optarg )
do_everything = 0;
do_typelib = 1;
break;
@ -634,5 +634,5 @@ index 00000000000..34ad6a97cfc
+ return 1;
+}
--
2.34.1
2.42.0

32
patches/winecfg-Staging/0001-winecfg-Add-staging-tab-for-CSMT.patch
View File

@ -1,4 +1,4 @@
From b6d9ed56703d771d5e2083cc30a55714a0166a96 Mon Sep 17 00:00:00 2001
From e9a0e31aa2a7f70fe4074f13e6b69e0d440ea469 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Sun, 14 Dec 2014 20:42:45 +0100
Subject: [PATCH] winecfg: Add staging tab for CSMT.
@ -14,22 +14,22 @@ Subject: [PATCH] winecfg: Add staging tab for CSMT.
create mode 100644 programs/winecfg/staging.c
diff --git a/programs/winecfg/Makefile.in b/programs/winecfg/Makefile.in
index f2f74cb77ea..8beaa7e8584 100644
index 780f0e7e183..99c829a9468 100644
--- a/programs/winecfg/Makefile.in
+++ b/programs/winecfg/Makefile.in
@@ -12,6 +12,7 @@ C_SRCS = \
driveui.c \
@@ -12,6 +12,7 @@ SOURCES = \
libraries.c \
logo.svg \
main.c \
+ staging.c \
theme.c \
winecfg.c \
x11drvdlg.c
winecfg.man.in \
diff --git a/programs/winecfg/main.c b/programs/winecfg/main.c
index 77b732d6819..b467a6f1c8f 100644
index d218d79770c..de5340c721f 100644
--- a/programs/winecfg/main.c
+++ b/programs/winecfg/main.c
@@ -58,7 +58,7 @@ PropSheetCallback (HWND hWnd, UINT uMsg, LPARAM lParam)
@@ -57,7 +57,7 @@ PropSheetCallback (HWND hWnd, UINT uMsg, LPARAM lParam)
return 0;
}
@ -38,7 +38,7 @@ index 77b732d6819..b467a6f1c8f 100644
static INT_PTR
doPropertySheet (HINSTANCE hInstance, HWND hOwner)
@@ -139,6 +139,16 @@ doPropertySheet (HINSTANCE hInstance, HWND hOwner)
@@ -138,6 +138,16 @@ doPropertySheet (HINSTANCE hInstance, HWND hOwner)
psp[pg].lParam = 0;
pg++;
@ -56,7 +56,7 @@ index 77b732d6819..b467a6f1c8f 100644
* Fill out the (General) PROPSHEETPAGE data structure
* for the property sheet
diff --git a/programs/winecfg/resource.h b/programs/winecfg/resource.h
index dd46bc71b40..582c5c967e4 100644
index cd7eaaf711e..f9f71adfcf6 100644
--- a/programs/winecfg/resource.h
+++ b/programs/winecfg/resource.h
@@ -45,6 +45,7 @@
@ -75,7 +75,7 @@ index dd46bc71b40..582c5c967e4 100644
#define IDC_WINVER 1012
#define IDC_DESKTOP_WIDTH 1023
#define IDC_DESKTOP_HEIGHT 1024
@@ -210,6 +212,9 @@
@@ -213,6 +215,9 @@
#define IDC_SYSPARAMS_MENU_HIGHLIGHT 8430
#define IDC_SYSPARAMS_MENUBAR 8431
@ -87,7 +87,7 @@ index dd46bc71b40..582c5c967e4 100644
#define IDC_ABT_ORG 8433
diff --git a/programs/winecfg/staging.c b/programs/winecfg/staging.c
new file mode 100644
index 00000000000..a2a2117a56d
index 00000000000..0bd6e1741a7
--- /dev/null
+++ b/programs/winecfg/staging.c
@@ -0,0 +1,82 @@
@ -174,10 +174,10 @@ index 00000000000..a2a2117a56d
+ return FALSE;
+}
diff --git a/programs/winecfg/winecfg.h b/programs/winecfg/winecfg.h
index 29751bf4555..a5f0e92beb6 100644
index f3f3ad2addf..d4fedff5afb 100644
--- a/programs/winecfg/winecfg.h
+++ b/programs/winecfg/winecfg.h
@@ -83,6 +83,7 @@ INT_PTR CALLBACK AppDlgProc (HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
@@ -85,6 +85,7 @@ INT_PTR CALLBACK AppDlgProc (HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam)
INT_PTR CALLBACK LibrariesDlgProc (HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);
INT_PTR CALLBACK AudioDlgProc (HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);
INT_PTR CALLBACK ThemeDlgProc (HWND hDlg, UINT uMsg, WPARAM wParam, LPARAM lParam);
@ -186,7 +186,7 @@ index 29751bf4555..a5f0e92beb6 100644
/* Windows version management */
diff --git a/programs/winecfg/winecfg.rc b/programs/winecfg/winecfg.rc
index 1faa0a60b55..895f68c1237 100644
index 982e7dd262a..ef41bf45921 100644
--- a/programs/winecfg/winecfg.rc
+++ b/programs/winecfg/winecfg.rc
@@ -38,6 +38,7 @@ BEGIN
@ -197,7 +197,7 @@ index 1faa0a60b55..895f68c1237 100644
IDS_TAB_ABOUT "About"
IDS_WINECFG_TITLE "Wine configuration"
IDS_WINECFG_TITLE_APP "Wine configuration for %s"
@@ -310,6 +311,15 @@ BEGIN
@@ -318,6 +319,15 @@ BEGIN
PUSHBUTTON "B&rowse...",IDC_BROWSE_SFPATH,195,195,50,13,WS_DISABLED
END
@ -214,5 +214,5 @@ index 1faa0a60b55..895f68c1237 100644
/* @makedep: winecfg.ico */
--
2.33.0
2.42.0

47
patches/winex11-Fixed-scancodes/0001-winecfg-Move-input-config-options-to-a-dedicated-tab.patch
View File

@ -1,4 +1,4 @@
From 311a382432c4dd6a6d2ded5e6c10c6fe83767646 Mon Sep 17 00:00:00 2001
From b97b584a775bf22c19c94064a7321770764cf25e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Bernon?= <rbernon@codeweavers.com>
Date: Thu, 5 Jan 2023 21:16:38 +0100
Subject: [PATCH] winecfg: Move input config options to a dedicated tab.
@ -12,16 +12,16 @@ Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=45605
programs/winecfg/main.c | 12 +++-
programs/winecfg/resource.h | 6 +-
programs/winecfg/winecfg.h | 4 ++
programs/winecfg/winecfg.rc | 36 +++++++-----
programs/winecfg/winecfg.rc | 38 ++++++++-----
programs/winecfg/x11drvdlg.c | 18 +-----
8 files changed, 150 insertions(+), 33 deletions(-)
8 files changed, 151 insertions(+), 34 deletions(-)
create mode 100644 programs/winecfg/input.c
diff --git a/MAINTAINERS b/MAINTAINERS
index 9d60385414f..a88bff34a92 100644
index dc5c85cc4ec..a5902235be8 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -181,6 +181,7 @@ F: dlls/user32/input.c
@@ -182,6 +182,7 @@ F: dlls/user32/input.c
F: dlls/win32u/input.c
F: dlls/win32u/rawinput.c
F: server/queue.c
@ -30,17 +30,17 @@ index 9d60385414f..a88bff34a92 100644
Input methods
M: Rémi Bernon <rbernon@codeweavers.com>
diff --git a/programs/winecfg/Makefile.in b/programs/winecfg/Makefile.in
index 80d2f1991dc..5c46b935234 100644
index 99c829a9468..1105a99e177 100644
--- a/programs/winecfg/Makefile.in
+++ b/programs/winecfg/Makefile.in
@@ -9,6 +9,7 @@ C_SRCS = \
@@ -9,6 +9,7 @@ SOURCES = \
audio.c \
drive.c \
driveui.c \
+ input.c \
libraries.c \
logo.svg \
main.c \
staging.c \
diff --git a/programs/winecfg/input.c b/programs/winecfg/input.c
new file mode 100644
index 00000000000..115161b9040
@ -153,10 +153,10 @@ index 00000000000..115161b9040
+ return FALSE;
+}
diff --git a/programs/winecfg/main.c b/programs/winecfg/main.c
index e2429c0c047..2ce3020db50 100644
index de5340c721f..819aaaf61e1 100644
--- a/programs/winecfg/main.c
+++ b/programs/winecfg/main.c
@@ -58,7 +58,7 @@ PropSheetCallback (HWND hWnd, UINT uMsg, LPARAM lParam)
@@ -57,7 +57,7 @@ PropSheetCallback (HWND hWnd, UINT uMsg, LPARAM lParam)
return 0;
}
@ -165,7 +165,7 @@ index e2429c0c047..2ce3020db50 100644
static INT_PTR
doPropertySheet (HINSTANCE hInstance, HWND hOwner)
@@ -149,6 +149,16 @@ doPropertySheet (HINSTANCE hInstance, HWND hOwner)
@@ -148,6 +148,16 @@ doPropertySheet (HINSTANCE hInstance, HWND hOwner)
psp[pg].lParam = 0;
pg++;
@ -183,7 +183,7 @@ index e2429c0c047..2ce3020db50 100644
* Fill out the (General) PROPSHEETPAGE data structure
* for the property sheet
diff --git a/programs/winecfg/resource.h b/programs/winecfg/resource.h
index d77f6a23a5a..78deb1a23a2 100644
index c0d7adadcc1..6e2953c0d70 100644
--- a/programs/winecfg/resource.h
+++ b/programs/winecfg/resource.h
@@ -46,6 +46,7 @@
@ -210,7 +210,7 @@ index d77f6a23a5a..78deb1a23a2 100644
#define IDC_RES_TRACKBAR 1107
#define IDC_RES_DPIEDIT 1108
@@ -227,3 +228,6 @@
@@ -230,3 +231,6 @@
#define IDC_ABT_TITLE_TEXT 8436
#define IDC_ABT_WEB_LINK 8437
#define IDC_ABT_LICENSE_TEXT 8438
@ -240,7 +240,7 @@ index d4fedff5afb..b83234470c1 100644
/* Windows version management */
BOOL set_winver_from_string(const WCHAR *version);
diff --git a/programs/winecfg/winecfg.rc b/programs/winecfg/winecfg.rc
index 9041a8fa2d1..605ec54632c 100644
index 428c477413c..1231e5319c5 100644
--- a/programs/winecfg/winecfg.rc
+++ b/programs/winecfg/winecfg.rc
@@ -40,6 +40,7 @@ BEGIN
@ -251,7 +251,7 @@ index 9041a8fa2d1..605ec54632c 100644
IDS_WINECFG_TITLE "Wine configuration"
IDS_WINECFG_TITLE_APP "Wine configuration for %s"
IDS_THEMEFILE "Theme files (*.msstyles; *.theme)"
@@ -165,22 +166,21 @@ IDD_GRAPHCFG DIALOG 0, 0, 260, 220
@@ -171,22 +172,21 @@ IDD_GRAPHCFG DIALOG 0, 0, 260, 220
STYLE WS_CHILD | WS_DISABLED
FONT 8, "MS Shell Dlg"
BEGIN
@ -268,17 +268,18 @@ index 9041a8fa2d1..605ec54632c 100644
- LTEXT "#msgctxt#do not translate#X",IDC_DESKTOP_BY,129,70,8,8,WS_DISABLED
- EDITTEXT IDC_DESKTOP_WIDTH,84,68,40,12,ES_AUTOHSCROLL | ES_NUMBER | WS_DISABLED
- EDITTEXT IDC_DESKTOP_HEIGHT,137,68,40,12,ES_AUTOHSCROLL | ES_NUMBER | WS_DISABLED
+ BS_AUTOCHECKBOX | WS_TABSTOP,15,44,230,10
+ LTEXT "Desktop &size:",IDC_DESKTOP_SIZE,15,58,64,16,WS_DISABLED
+ LTEXT "#msgctxt#do not translate#X",IDC_DESKTOP_BY,129,58,8,8,WS_DISABLED
+ EDITTEXT IDC_DESKTOP_WIDTH,84,56,40,12,ES_AUTOHSCROLL | ES_NUMBER | WS_DISABLED
+ EDITTEXT IDC_DESKTOP_HEIGHT,137,56,40,12,ES_AUTOHSCROLL | ES_NUMBER | WS_DISABLED
-
- GROUPBOX "Screen resolution",IDC_STATIC,8,95,244,84
- CONTROL "", IDC_RES_TRACKBAR, "msctls_trackbar32",WS_TABSTOP,12,105,171,15
- EDITTEXT IDC_RES_DPIEDIT,188,105,23,13,ES_NUMBER|WS_TABSTOP
- LTEXT "#msgctxt#unit: dots/inch#dpi",IDC_STATIC,215,107,30,8
- LTEXT "This is a sample text using 10 point Tahoma",IDC_RES_FONT_PREVIEW,15,124,230,49
+ BS_AUTOCHECKBOX | WS_TABSTOP,15,44,230,10
+ LTEXT "Desktop &size:",IDC_DESKTOP_SIZE,15,58,64,16,WS_DISABLED
+ LTEXT "#msgctxt#do not translate#X",IDC_DESKTOP_BY,129,58,8,8,WS_DISABLED
+ EDITTEXT IDC_DESKTOP_WIDTH,84,56,40,12,ES_AUTOHSCROLL | ES_NUMBER | WS_DISABLED
+ EDITTEXT IDC_DESKTOP_HEIGHT,137,56,40,12,ES_AUTOHSCROLL | ES_NUMBER | WS_DISABLED
+
+ GROUPBOX "Screen resolution",IDC_STATIC,8,83,244,84
+ CONTROL "", IDC_RES_TRACKBAR, "msctls_trackbar32",WS_TABSTOP,12,93,171,15
+ EDITTEXT IDC_RES_DPIEDIT,188,93,23,13,ES_NUMBER|WS_TABSTOP
@ -287,7 +288,7 @@ index 9041a8fa2d1..605ec54632c 100644
END
IDD_DLLCFG DIALOG 0, 0, 260, 220
@@ -324,6 +324,14 @@ BEGIN
@@ -332,6 +332,14 @@ BEGIN
CONTROL "Enable &GTK3 Theming",IDC_ENABLE_GTK3,"Button",BS_AUTOCHECKBOX | WS_TABSTOP,16,100,230,8
END
@ -353,5 +354,5 @@ index 215cd6534a2..cd7b7552a1e 100644
break;
}
--
2.39.2
2.42.0

2
staging/upstream-commit
View File

@ -1 +1 @@
9d78031de6261f29d42e18db04f9925cfba24108
de66ea9df6746917cada71d2c27b5cc38cbdd2f0