mirror of
https://gitlab.winehq.org/wine/wine-staging.git
synced 2024-09-13 09:17:20 -07:00
Updated mailing-list-patches patchset
This commit is contained in:
Alistair Leslie-Hughes
parent
9092f3922a
commit
0bdc57245a
@ -0,0 +1,27 @@
|
||||
From 7db74392c6ef12ec43493af92f2220f62070b77e Mon Sep 17 00:00:00 2001
|
||||
From: Huw Davies <huw@codeweavers.com>
|
||||
Date: Mon, 15 Jul 2019 15:04:16 +0100
|
||||
Subject: [PATCH] shell32: On macOS don't link against CoreServices.
|
||||
|
||||
This has not been required since commit efac5d0672728f1b6d85d28aafced14223aecf16.
|
||||
|
||||
Signed-off-by: Huw Davies <huw@codeweavers.com>
|
||||
---
|
||||
dlls/shell32/Makefile.in | 1 -
|
||||
1 file changed, 1 deletion(-)
|
||||
|
||||
diff --git a/dlls/shell32/Makefile.in b/dlls/shell32/Makefile.in
|
||||
index 20365b96fb..fe49bf09f9 100644
|
||||
--- a/dlls/shell32/Makefile.in
|
||||
+++ b/dlls/shell32/Makefile.in
|
||||
@@ -3,7 +3,6 @@ MODULE = shell32.dll
|
||||
IMPORTLIB = shell32
|
||||
IMPORTS = uuid shlwapi user32 gdi32 advapi32
|
||||
DELAYIMPORTS = ole32 oleaut32 shdocvw version comctl32 gdiplus
|
||||
-EXTRALIBS = $(CORESERVICES_LIBS)
|
||||
# AUTHORS file is in the top-level directory
|
||||
EXTRAINCL = -I$(top_srcdir)
|
||||
|
||||
--
|
||||
2.17.1
|
||||
|
||||
@ -2051,11 +2051,11 @@ fi
|
||||
# | dlls/dxgi/swapchain.c, dlls/dxgi/tests/dxgi.c, dlls/evr/Makefile.in, dlls/evr/evr.c, dlls/evr/main.c,
|
||||
# | dlls/gdi32/freetype.c, dlls/mscoree/mscoree_main.c, dlls/mscorwks/Makefile.in, dlls/mscorwks/mscorwks.spec,
|
||||
# | dlls/ntdll/directory.c, dlls/ntoskrnl.exe/ntoskrnl.c, dlls/ntoskrnl.exe/ntoskrnl_private.h, dlls/ntoskrnl.exe/pnp.c,
|
||||
# | dlls/qedit/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, include/Makefile.in, include/d3drm.h,
|
||||
# | include/d3drmobj.h, include/strongname.h, loader/Makefile.in, loader/wine.inf.in, loader/winebus.inf.in,
|
||||
# | programs/wineboot/Makefile.in, programs/wineboot/wineboot.c, tools/make_specfiles
|
||||
# | dlls/qedit/Makefile.in, 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,
|
||||
# | include/Makefile.in, include/d3drm.h, include/d3drmobj.h, include/strongname.h, loader/Makefile.in, loader/wine.inf.in,
|
||||
# | loader/winebus.inf.in, 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
|
||||
@ -2084,6 +2084,7 @@ if test "$enable_mailing_list_patches" -eq 1; then
|
||||
patch_apply mailing-list-patches/0024-include-Add-strongname.h.patch
|
||||
patch_apply mailing-list-patches/0025-mscoree-Fix-the-signature-for-StrongNameSignatureVer.patch
|
||||
patch_apply mailing-list-patches/0026-mscoree-Fake-success-from-StrongNameSignatureVerific.patch
|
||||
patch_apply mailing-list-patches/0027-shell32-On-macOS-don-t-link-against-CoreServices.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 },';
|
||||
@ -2111,6 +2112,7 @@ if test "$enable_mailing_list_patches" -eq 1; then
|
||||
printf '%s\n' '+ { "Zebediah Figura", "include: Add strongname.h.", 1 },';
|
||||
printf '%s\n' '+ { "Zebediah Figura", "mscoree: Fix the signature for StrongNameSignatureVerification[Ex]().", 1 },';
|
||||
printf '%s\n' '+ { "Zebediah Figura", "mscoree: Fake success from StrongNameSignatureVerificationEx().", 1 },';
|
||||
printf '%s\n' '+ { "Huw Davies", "shell32: On macOS don'\''t link against CoreServices.", 1 },';
|
||||
) >> "$patchlist"
|
||||
fi
|
||||
|
||||
|
||||
@ -1,17 +1,17 @@
|
||||
From 10282216ac965075a8bf43734bfdaabd24fedf25 Mon Sep 17 00:00:00 2001
|
||||
From 7865341c5b4e465ec027e8da439773bf3619a4f7 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: shell32: Add security property tab.
|
||||
Subject: [PATCH] shell32: Add security property tab.
|
||||
|
||||
---
|
||||
dlls/shell32/Makefile.in | 2 +-
|
||||
dlls/shell32/shell32.rc | 27 +++
|
||||
dlls/shell32/shlview_cmenu.c | 383 +++++++++++++++++++++++++++++++++++++++++++
|
||||
dlls/shell32/shlview_cmenu.c | 383 +++++++++++++++++++++++++++++++++++
|
||||
dlls/shell32/shresdef.h | 27 +++
|
||||
4 files changed, 438 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/dlls/shell32/Makefile.in b/dlls/shell32/Makefile.in
|
||||
index 970ecba..d6d6eca 100644
|
||||
index fe49bf09f98..f6fcf2e18eb 100644
|
||||
--- a/dlls/shell32/Makefile.in
|
||||
+++ b/dlls/shell32/Makefile.in
|
||||
@@ -1,7 +1,7 @@
|
||||
@ -21,10 +21,10 @@ index 970ecba..d6d6eca 100644
|
||||
-IMPORTS = uuid shlwapi user32 gdi32 advapi32
|
||||
+IMPORTS = uuid shlwapi user32 gdi32 advapi32 aclui
|
||||
DELAYIMPORTS = ole32 oleaut32 shdocvw version comctl32 gdiplus
|
||||
EXTRALIBS = $(CORESERVICES_LIBS)
|
||||
# AUTHORS file is in the top-level directory
|
||||
EXTRAINCL = -I$(top_srcdir)
|
||||
diff --git a/dlls/shell32/shell32.rc b/dlls/shell32/shell32.rc
|
||||
index 826e291..d7129b6 100644
|
||||
index 8739718f715..fb890a5953b 100644
|
||||
--- a/dlls/shell32/shell32.rc
|
||||
+++ b/dlls/shell32/shell32.rc
|
||||
@@ -204,6 +204,33 @@ the folder?"
|
||||
@ -62,7 +62,7 @@ index 826e291..d7129b6 100644
|
||||
/* FIXME: Some will be unused until desktop.ini support is implemented */
|
||||
IDS_PROGRAMS "Programs"
|
||||
diff --git a/dlls/shell32/shlview_cmenu.c b/dlls/shell32/shlview_cmenu.c
|
||||
index fc761e1..0bdb85e 100644
|
||||
index 04ac0b6fd3c..3ea61dd730d 100644
|
||||
--- a/dlls/shell32/shlview_cmenu.c
|
||||
+++ b/dlls/shell32/shlview_cmenu.c
|
||||
@@ -39,12 +39,131 @@
|
||||
@ -476,7 +476,7 @@ index fc761e1..0bdb85e 100644
|
||||
hpsxa = SHCreatePropSheetExtArrayEx(HKEY_CLASSES_ROOT, wszFiletype, MAX_PROP_PAGES - psh.nPages, lpDo);
|
||||
if (hpsxa != NULL)
|
||||
diff --git a/dlls/shell32/shresdef.h b/dlls/shell32/shresdef.h
|
||||
index ed76ac8..26fc4cd 100644
|
||||
index 33edb584c1b..e2211024cc3 100644
|
||||
--- a/dlls/shell32/shresdef.h
|
||||
+++ b/dlls/shell32/shresdef.h
|
||||
@@ -157,6 +157,33 @@
|
||||
@ -514,5 +514,5 @@ index ed76ac8..26fc4cd 100644
|
||||
#define IDS_RECYCLEBIN_FOLDER_NAME 8964
|
||||
|
||||
--
|
||||
2.7.4
|
||||
2.17.1
|
||||
|
||||
|
||||
Loading…
Reference in New Issue
Block a user