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

Browse Source
This commit is contained in:
Alistair Leslie-Hughes 2023-11-02 14:01:32 +11:00
parent 753c2c9012
commit aeddc191a7
8 changed files with 59 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
patches/dbghelp-Debug_Symbols/0001-dbghelp-Always-check-for-debug-symbols-in-BINDIR.patch
View File

@ -1,4 +1,4 @@
From d51057f7c91016d2c6f5c3b21d201f86d7c085b5 Mon Sep 17 00:00:00 2001
From 9d274e6d152c3f3961212f3cbd71dc8f14641367 Mon Sep 17 00:00:00 2001
From: Sebastian Lackner <sebastian@fds-team.de>
Date: Mon, 6 Oct 2014 05:06:06 +0200
Subject: [PATCH] dbghelp: Always check for debug symbols in BINDIR.
@ -9,7 +9,7 @@ Subject: [PATCH] dbghelp: Always check for debug symbols in BINDIR.
2 files changed, 2 insertions(+), 1 deletion(-)
diff --git a/dlls/dbghelp/Makefile.in b/dlls/dbghelp/Makefile.in
index 3657fa7db12..c8114677bc6 100644
index 152ef80611a..06ebb65e2af 100644
--- a/dlls/dbghelp/Makefile.in
+++ b/dlls/dbghelp/Makefile.in
@@ -2,7 +2,7 @@ MODULE = dbghelp.dll
@ -19,10 +19,10 @@ index 3657fa7db12..c8114677bc6 100644
-EXTRADEFS = -D_IMAGEHLP_SOURCE_
+EXTRADEFS = -D_IMAGEHLP_SOURCE_ -DBINDIR="L\"${bindir}\""
C_SRCS = \
SOURCES = \
coff.c \
diff --git a/dlls/dbghelp/elf_module.c b/dlls/dbghelp/elf_module.c
index a2a60752a68..a2bca11048f 100644
index 5ada8c70c9b..a9a6303c8d7 100644
--- a/dlls/dbghelp/elf_module.c
+++ b/dlls/dbghelp/elf_module.c
@@ -1457,6 +1457,7 @@ static BOOL elf_search_and_load_file(struct process* pcs, const WCHAR* filename,

22
patches/inseng-Implementation/0001-inseng-Implement-CIF-reader-and-download-functions.patch
View File

@ -1,40 +1,38 @@
From c62655b9d54ce8b692bd84d41abe09cc40ae10e1 Mon Sep 17 00:00:00 2001
From bfbe6a0ac4ea5d75a58c09e677dfb01bcb2e85cf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Mon, 5 Sep 2016 15:31:29 +0200
Subject: [PATCH] inseng: Implement CIF reader and download functions.
FIXME: Needs splitting.
---
dlls/inseng/Makefile.in | 7 +-
dlls/inseng/Makefile.in | 4 +-
dlls/inseng/icif.c | 1745 ++++++++++++++++++++++++++++++++++
dlls/inseng/inf.c | 443 +++++++++
dlls/inseng/inseng.spec | 4 +-
dlls/inseng/inseng_main.c | 990 ++++++++++++++++++-
dlls/inseng/inseng_private.h | 79 ++
include/inseng.idl | 276 +++++-
7 files changed, 3490 insertions(+), 54 deletions(-)
7 files changed, 3488 insertions(+), 53 deletions(-)
create mode 100644 dlls/inseng/icif.c
create mode 100644 dlls/inseng/inf.c
create mode 100644 dlls/inseng/inseng_private.h
diff --git a/dlls/inseng/Makefile.in b/dlls/inseng/Makefile.in
index 0217203791a..ba2388c97ed 100644
index 40eda55661a..72fa3533930 100644
--- a/dlls/inseng/Makefile.in
+++ b/dlls/inseng/Makefile.in
@@ -1,8 +1,11 @@
@@ -1,8 +1,10 @@
MODULE = inseng.dll
-IMPORTS = uuid ole32 advapi32
+IMPORTS = uuid ole32 advapi32 urlmon shlwapi
EXTRADLLFLAGS = -Wb,--prefer-native
-C_SRCS = inseng_main.c
+C_SRCS = \
SOURCES = \
+ icif.c \
+ inf.c \
+ inseng_main.c
IDL_SRCS = inseng_classes.idl
inseng_classes.idl \
inseng_main.c
diff --git a/dlls/inseng/icif.c b/dlls/inseng/icif.c
new file mode 100644
index 00000000000..27f6f6dfd93
@ -2249,7 +2247,7 @@ index 82c0b4d5fe1..7ae46fad3a7 100644
+@ stdcall GetICifRWFileFromFile(ptr str)
@ stub PurgeDownloadDirectory
diff --git a/dlls/inseng/inseng_main.c b/dlls/inseng/inseng_main.c
index c72a12955b8..87d11472ff0 100644
index c72a12955b8..88017536874 100644
--- a/dlls/inseng/inseng_main.c
+++ b/dlls/inseng/inseng_main.c
@@ -2,6 +2,7 @@
@ -3862,5 +3860,5 @@ index 8a3f4c4d270..82927418a99 100644
+cpp_quote("HRESULT WINAPI GetICifFileFromFile(ICifFile **, const char *);")
+cpp_quote("HRESULT WINAPI GetICifRWFileFromFile(ICifRWFile **, const char *);")
--
2.34.1
2.42.0

14
patches/ntdll-RtlQueryPackageIdentity/0003-ntdll-tests-Add-basic-tests-for-RtlQueryPackageIdent.patch
View File

@ -1,4 +1,4 @@
From 3242c225381a5beb2690402b8e37179bb9f3e71f Mon Sep 17 00:00:00 2001
From fa493586583e4dd534b01b72812c7ab79c0aecca Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20M=C3=BCller?= <michael@fds-team.de>
Date: Sun, 17 Jan 2016 00:50:50 +0100
Subject: [PATCH] ntdll/tests: Add basic tests for RtlQueryPackageIdentity.
@ -9,7 +9,7 @@ Subject: [PATCH] ntdll/tests: Add basic tests for RtlQueryPackageIdentity.
2 files changed, 81 insertions(+), 1 deletion(-)
diff --git a/dlls/ntdll/tests/Makefile.in b/dlls/ntdll/tests/Makefile.in
index 90deb5865f8..428ebde23b3 100644
index 3ca77a03053..7508e1ad796 100644
--- a/dlls/ntdll/tests/Makefile.in
+++ b/dlls/ntdll/tests/Makefile.in
@@ -1,5 +1,5 @@
@ -17,10 +17,10 @@ index 90deb5865f8..428ebde23b3 100644
-IMPORTS = user32 advapi32
+IMPORTS = user32 ole32 advapi32
C_SRCS = \
SOURCES = \
atom.c \
diff --git a/dlls/ntdll/tests/rtl.c b/dlls/ntdll/tests/rtl.c
index 117d9eed067..1255ad93dd8 100644
index 88f62b0b588..8ca339dde0f 100644
--- a/dlls/ntdll/tests/rtl.c
+++ b/dlls/ntdll/tests/rtl.c
@@ -29,6 +29,9 @@
@ -53,7 +53,7 @@ index 117d9eed067..1255ad93dd8 100644
pLdrRegisterDllNotification = (void *)GetProcAddress(hntdll, "LdrRegisterDllNotification");
pLdrUnregisterDllNotification = (void *)GetProcAddress(hntdll, "LdrUnregisterDllNotification");
}
@@ -3609,6 +3618,76 @@ static void test_RtlFirstFreeAce(void)
@@ -3611,6 +3620,76 @@ static void test_RtlFirstFreeAce(void)
HeapFree(GetProcessHeap(), 0, acl);
}
@ -130,7 +130,7 @@ index 117d9eed067..1255ad93dd8 100644
static void test_RtlInitializeSid(void)
{
SID_IDENTIFIER_AUTHORITY sid_ident = { SECURITY_NT_AUTHORITY };
@@ -3688,6 +3767,7 @@ START_TEST(rtl)
@@ -3690,6 +3769,7 @@ START_TEST(rtl)
test_RtlInitializeCriticalSectionEx();
test_RtlLeaveCriticalSection();
test_LdrEnumerateLoadedModules();
@ -139,5 +139,5 @@ index 117d9eed067..1255ad93dd8 100644
test_LdrRegisterDllNotification();
test_DbgPrint();
--
2.40.1
2.42.0

28
patches/odbc-remove-unixodbc/0001-odbc32-Remove-unixODBC-support.patch
View File

@ -1,7 +1,7 @@
From de6ee9b0358cb5d6464808751a9d33ed0564afcd Mon Sep 17 00:00:00 2001
From d5d4bf5bd38c5567ea475c6528120fdc44b0f7f6 Mon Sep 17 00:00:00 2001
From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
Date: Thu, 2 Feb 2023 14:20:44 +1100
Subject: [PATCH 01/42] odbc32: Remove unixODBC support
Subject: [PATCH] odbc32: Remove unixODBC support
---
configure.ac | 3 -
@ -15,10 +15,10 @@ Subject: [PATCH 01/42] odbc32: Remove unixODBC support
delete mode 100644 dlls/odbc32/unixlib.h
diff --git a/configure.ac b/configure.ac
index 590ef29eb35..1033af2e613 100644
index 603aadf2924..ba80dfe58f8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1768,9 +1768,6 @@ then
@@ -1796,9 +1796,6 @@ then
AC_SUBST(PROCSTAT_LIBS,"-lprocstat")])
fi
@ -29,18 +29,16 @@ index 590ef29eb35..1033af2e613 100644
if test "x$with_netapi" != "xno"
then
diff --git a/dlls/odbc32/Makefile.in b/dlls/odbc32/Makefile.in
index def7b4b5d67..3d644700c08 100644
index 44962ca4896..65d481facd9 100644
--- a/dlls/odbc32/Makefile.in
+++ b/dlls/odbc32/Makefile.in
@@ -4,7 +4,6 @@ IMPORTLIB = odbc32
IMPORTS = advapi32
@@ -5,5 +5,4 @@ IMPORTS = advapi32
C_SRCS = \
- proxyodbc.c \
SOURCES = \
proxyodbc.c \
- rsrc.rc \
- unixlib.c
+ proxyodbc.c
RC_SRCS = rsrc.rc
+ rsrc.rc
diff --git a/dlls/odbc32/proxyodbc.c b/dlls/odbc32/proxyodbc.c
index 679f3d7380e..e8574430e74 100644
--- a/dlls/odbc32/proxyodbc.c
@ -4189,10 +4187,10 @@ index 13ce8d0883b..00000000000
-struct SQLTablesW_params { SQLHSTMT StatementHandle; SQLWCHAR *CatalogName; SQLSMALLINT NameLength1; SQLWCHAR *SchemaName; SQLSMALLINT NameLength2; SQLWCHAR *TableName; SQLSMALLINT NameLength3; SQLWCHAR *TableType; SQLSMALLINT NameLength4; };
-struct SQLTransact_params { SQLHENV EnvironmentHandle; SQLHDBC ConnectionHandle; SQLUSMALLINT CompletionType; };
diff --git a/include/config.h.in b/include/config.h.in
index 933197b6f7d..617e2856255 100644
index 4461fb060cb..1a8d0385fd5 100644
--- a/include/config.h.in
+++ b/include/config.h.in
@@ -795,9 +795,6 @@
@@ -762,9 +762,6 @@
/* Define to the soname of the libnetapi library. */
#undef SONAME_LIBNETAPI
@ -4203,5 +4201,5 @@ index 933197b6f7d..617e2856255 100644
#undef SONAME_LIBOSMESA
--
2.39.1
2.42.0

18
patches/packager-DllMain/0001-packager-Prefer-native-version.patch
View File

@ -1,25 +1,23 @@
From cea29373b287ae84e28adca9834ffdbb97844ffe Mon Sep 17 00:00:00 2001
From bc118983b67f87ed7858711d03cff34050b92770 Mon Sep 17 00:00:00 2001
From: Sebastian Lackner <sebastian@fds-team.de>
Date: Sun, 6 Aug 2017 02:50:23 +0200
Subject: [PATCH] packager: Prefer native version.
---
dlls/packager/Makefile.in | 2 ++
1 file changed, 2 insertions(+)
dlls/packager/Makefile.in | 1 +
1 file changed, 1 insertion(+)
diff --git a/dlls/packager/Makefile.in b/dlls/packager/Makefile.in
index f539cb6f095..faef8deb263 100644
index 5fc89d807a8..3589b37be9c 100644
--- a/dlls/packager/Makefile.in
+++ b/dlls/packager/Makefile.in
@@ -2,6 +2,8 @@ EXTRADEFS = -DWINE_NO_LONG_TYPES
@@ -1,5 +1,6 @@
MODULE = packager.dll
IMPORTS = uuid shell32 shlwapi user32
+EXTRADLLFLAGS = -Wb,--prefer-native
+
C_SRCS = \
packager_main.c
SOURCES = \
packager.rc \
--
2.34.1
2.42.0

20
patches/winemapi-user-xdg-mail/0001-winemapi-Directly-use-xdg-email-if-available-enablin.patch
View File

@ -1,4 +1,4 @@
From 0ae9f7c32cf873611ce5ed7f341f5979690f2318 Mon Sep 17 00:00:00 2001
From 3699802cf7dd4a6afa594530f5802fa84a720dbf Mon Sep 17 00:00:00 2001
From: Jeremy White <jwhite@codeweavers.com>
Date: Thu, 29 Mar 2018 11:58:25 +1100
Subject: [PATCH] winemapi: Directly use xdg-email if available, enabling file
@ -20,18 +20,18 @@ Signed-off-by: Jeremy White <jwhite@codeweavers.com>
create mode 100644 dlls/winemapi/xdg-email.c
diff --git a/dlls/winemapi/Makefile.in b/dlls/winemapi/Makefile.in
index 84ff227e1cb..4fd83830aea 100644
index c9c5a5152f4..99aea124605 100644
--- a/dlls/winemapi/Makefile.in
+++ b/dlls/winemapi/Makefile.in
@@ -5,4 +5,5 @@ EXTRADLLFLAGS = -mno-cygwin
@@ -3,4 +3,5 @@ IMPORTS = shlwapi shell32 mapi32
C_SRCS = \
SOURCES = \
main.c \
- sendmail.c
+ sendmail.c \
+ xdg-email.c
diff --git a/dlls/winemapi/sendmail.c b/dlls/winemapi/sendmail.c
index ca1b6c59df1..e288837a33d 100644
index 1bd3908ef6d..053d39b009d 100644
--- a/dlls/winemapi/sendmail.c
+++ b/dlls/winemapi/sendmail.c
@@ -34,6 +34,8 @@
@ -48,8 +48,7 @@ index ca1b6c59df1..e288837a33d 100644
/**************************************************************************
- * MAPISendMail
+ * BrowserSendMail
*
- *
- * Send a message using a native mail client.
- *
- * PARAMS
@ -58,7 +57,8 @@ index ca1b6c59df1..e288837a33d 100644
- * message [I] Pointer to a MAPIMessage structure.
- * flags [I] Flags.
- * reserved [I] Reserved, pass 0.
- *
+ * BrowserSendMail
*
- * RETURNS
- * Success: SUCCESS_SUCCESS
- * Failure: MAPI_E_FAILURE
@ -141,7 +141,7 @@ index 00000000000..a8bb8c5e075
+#endif /* __WINEMAPI_PRIVATE_INCLUDED__ */
diff --git a/dlls/winemapi/xdg-email.c b/dlls/winemapi/xdg-email.c
new file mode 100644
index 00000000000..08a9b49cc7f
index 00000000000..a92f8ca079a
--- /dev/null
+++ b/dlls/winemapi/xdg-email.c
@@ -0,0 +1,241 @@
@ -387,5 +387,5 @@ index 00000000000..08a9b49cc7f
+ return ret;
+}
--
2.17.1
2.42.0

12
patches/xactengine-initial/0003-xactengine3_7-tests-Add-Global-settings-test.patch
View File

@ -1,4 +1,4 @@
From a75e31b9098b8d111ec06a8a3f08470ae8992606 Mon Sep 17 00:00:00 2001
From ed6dabac0ebcbb188fb800021026992cb726bb88 Mon Sep 17 00:00:00 2001
From: Alistair Leslie-Hughes <leslie_alistair@hotmail.com>
Date: Thu, 1 Oct 2020 18:34:23 +1000
Subject: [PATCH] xactengine3_7/tests: Add Global settings test
@ -13,7 +13,7 @@ Subject: [PATCH] xactengine3_7/tests: Add Global settings test
create mode 100644 dlls/xactengine3_7/tests/rsrc.rc
diff --git a/dlls/xactengine3_7/tests/Makefile.in b/dlls/xactengine3_7/tests/Makefile.in
index c32b2562546..0da28c85922 100644
index 54046e85b88..a9b21279158 100644
--- a/dlls/xactengine3_7/tests/Makefile.in
+++ b/dlls/xactengine3_7/tests/Makefile.in
@@ -1,5 +1,8 @@
@ -21,7 +21,7 @@ index c32b2562546..0da28c85922 100644
-IMPORTS = ole32
+IMPORTS = ole32 x3daudio1_7
C_SRCS = \
SOURCES = \
xact3.c
+
+RC_SRCS = \
@ -70,10 +70,10 @@ index 00000000000..2c1961c727a
+/* @makedep: globals.xgs*/
+globals.xgs RCDATA "globals.xgs"
diff --git a/dlls/xactengine3_7/tests/xact3.c b/dlls/xactengine3_7/tests/xact3.c
index 5daa18ca81b..7644ec1dfb8 100644
index 48a5f0a4374..d1e168d1489 100644
--- a/dlls/xactengine3_7/tests/xact3.c
+++ b/dlls/xactengine3_7/tests/xact3.c
@@ -261,11 +261,72 @@ static void test_notifications(void)
@@ -287,11 +287,72 @@ static void test_notifications(void)
DeleteFileW(filename);
}
@ -147,5 +147,5 @@ index 5daa18ca81b..7644ec1dfb8 100644
CoUninitialize();
--
2.35.1
2.42.0

2
staging/upstream-commit
View File

@ -1 +1 @@
0170cd3a4c67bd99291234dd8e0d638a824d7715
a3209daea543104fbfac5900bf9ec0c05a0a43fc