mirror of
https://gitlab.winehq.org/wine/wine-staging.git
synced 2024-09-13 09:17:20 -07:00
Rebase against 6b724c3dd8d1ae83e90d4e7e9ec191016fabc7d0.
This commit is contained in:
Zebediah Figura
parent
8a2658a2ce
commit
5f6802dae2
@ -1,27 +0,0 @@
|
||||
From ebf3df9837ac6707fe831722c7ed24ccd80f95ce Mon Sep 17 00:00:00 2001
|
||||
From: Thomas Crider <gloriouseggroll@gmail.com>
|
||||
Date: Sat, 29 May 2021 14:39:08 -0600
|
||||
Subject: [PATCH] api-ms-win-core-psapi-l1-1-0: Add K32GetModuleBaseNameW and
|
||||
K32GetModuleInformation.
|
||||
|
||||
Needed for Mass Effect Legendary Edition.
|
||||
|
||||
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51199
|
||||
Signed-off-by: Thomas Crider <gloriouseggroll@gmail.com>
|
||||
---
|
||||
.../api-ms-win-core-psapi-l1-1-0.spec | 2 ++
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
diff --git a/dlls/api-ms-win-core-psapi-l1-1-0/api-ms-win-core-psapi-l1-1-0.spec b/dlls/api-ms-win-core-psapi-l1-1-0/api-ms-win-core-psapi-l1-1-0.spec
|
||||
index c54c1077843..321fc3fe928 100644
|
||||
--- a/dlls/api-ms-win-core-psapi-l1-1-0/api-ms-win-core-psapi-l1-1-0.spec
|
||||
+++ b/dlls/api-ms-win-core-psapi-l1-1-0/api-ms-win-core-psapi-l1-1-0.spec
|
||||
@@ -14,3 +14,5 @@
|
||||
@ stdcall K32QueryWorkingSet(long ptr long) kernel32.K32QueryWorkingSet
|
||||
@ stdcall K32QueryWorkingSetEx(long ptr long) kernel32.K32QueryWorkingSetEx
|
||||
@ stdcall QueryFullProcessImageNameW(ptr long ptr ptr) kernel32.QueryFullProcessImageNameW
|
||||
+@ stdcall K32GetModuleBaseNameW(long long ptr long) kernel32.K32GetModuleBaseNameW
|
||||
+@ stdcall K32GetModuleInformation(long long ptr long) kernel32.K32GetModuleInformation
|
||||
--
|
||||
2.30.2
|
||||
|
||||
@ -1,25 +0,0 @@
|
||||
From c96b3a0632721f8849fb1d8404272b5007c1d1b4 Mon Sep 17 00:00:00 2001
|
||||
From: Thomas Crider <gloriouseggroll@gmail.com>
|
||||
Date: Sat, 29 May 2021 14:39:09 -0600
|
||||
Subject: [PATCH] api-ms-win-core-psapi-ansi-l1-1-0: add K32GetModuleBaseNameA
|
||||
|
||||
Needed for Mass Effect Legendary Edition.
|
||||
|
||||
Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=51199
|
||||
Signed-off-by: Thomas Crider <gloriouseggroll@gmail.com>
|
||||
---
|
||||
.../api-ms-win-core-psapi-ansi-l1-1-0.spec | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
|
||||
diff --git a/dlls/api-ms-win-core-psapi-ansi-l1-1-0/api-ms-win-core-psapi-ansi-l1-1-0.spec b/dlls/api-ms-win-core-psapi-ansi-l1-1-0/api-ms-win-core-psapi-ansi-l1-1-0.spec
|
||||
index e4f758581f6..340198c6edf 100644
|
||||
--- a/dlls/api-ms-win-core-psapi-ansi-l1-1-0/api-ms-win-core-psapi-ansi-l1-1-0.spec
|
||||
+++ b/dlls/api-ms-win-core-psapi-ansi-l1-1-0/api-ms-win-core-psapi-ansi-l1-1-0.spec
|
||||
@@ -4,3 +4,4 @@
|
||||
@ stdcall K32GetMappedFileNameA(long ptr ptr long) kernel32.K32GetMappedFileNameA
|
||||
@ stdcall K32GetProcessImageFileNameA(long ptr long) kernel32.K32GetProcessImageFileNameA
|
||||
@ stdcall QueryFullProcessImageNameA(ptr long ptr ptr) kernel32.QueryFullProcessImageNameA
|
||||
+@ stdcall K32GetModuleBaseNameA(long long ptr long) kernel32.K32GetModuleBaseNameA
|
||||
--
|
||||
2.30.2
|
||||
|
||||
@ -1 +0,0 @@
|
||||
Fixes: [51199] Add missing api-ms-win-core-psapi forwards
|
||||
@ -51,7 +51,7 @@ usage()
|
||||
# Get the upstream commit sha
|
||||
upstream_commit()
|
||||
{
|
||||
echo "9f6e39e8b945466180080d470e1272ba4f807b3a"
|
||||
echo "6b724c3dd8d1ae83e90d4e7e9ec191016fabc7d0"
|
||||
}
|
||||
|
||||
# Show version information
|
||||
@ -87,7 +87,6 @@ patch_enable_all ()
|
||||
enable_Staging="$1"
|
||||
enable_advapi32_LsaLookupPrivilegeName="$1"
|
||||
enable_api_ms_win_Stub_DLLs="$1"
|
||||
enable_api_ms_win_core_psapi_K32GetModuleInformation="$1"
|
||||
enable_bcrypt_ECDHSecretAgreement="$1"
|
||||
enable_cmd_launch_association="$1"
|
||||
enable_comctl32_rebar_capture="$1"
|
||||
@ -303,9 +302,6 @@ patch_enable ()
|
||||
api-ms-win-Stub_DLLs)
|
||||
enable_api_ms_win_Stub_DLLs="$2"
|
||||
;;
|
||||
api-ms-win-core-psapi-K32GetModuleInformation)
|
||||
enable_api_ms_win_core_psapi_K32GetModuleInformation="$2"
|
||||
;;
|
||||
bcrypt-ECDHSecretAgreement)
|
||||
enable_bcrypt_ECDHSecretAgreement="$2"
|
||||
;;
|
||||
@ -1524,20 +1520,6 @@ if test "$enable_api_ms_win_Stub_DLLs" -eq 1; then
|
||||
patch_apply api-ms-win-Stub_DLLs/0027-uiautomationcore-Add-dll-and-stub-some-functions.patch
|
||||
fi
|
||||
|
||||
# Patchset api-ms-win-core-psapi-K32GetModuleInformation
|
||||
# |
|
||||
# | This patchset fixes the following Wine bugs:
|
||||
# | * [#51199] Add missing api-ms-win-core-psapi forwards
|
||||
# |
|
||||
# | Modified files:
|
||||
# | * dlls/api-ms-win-core-psapi-ansi-l1-1-0/api-ms-win-core-psapi-ansi-l1-1-0.spec, dlls/api-ms-win-core-psapi-l1-1-0/api-ms-
|
||||
# | win-core-psapi-l1-1-0.spec
|
||||
# |
|
||||
if test "$enable_api_ms_win_core_psapi_K32GetModuleInformation" -eq 1; then
|
||||
patch_apply api-ms-win-core-psapi-K32GetModuleInformation/0001-api-ms-win-core-psapi-l1-1-0-Add-K32GetModuleBaseNam.patch
|
||||
patch_apply api-ms-win-core-psapi-K32GetModuleInformation/0002-api-ms-win-core-psapi-ansi-l1-1-0-add-K32GetModuleBa.patch
|
||||
fi
|
||||
|
||||
# Patchset bcrypt-ECDHSecretAgreement
|
||||
# |
|
||||
# | This patchset fixes the following Wine bugs:
|
||||
|
||||
@ -1,4 +1,4 @@
|
||||
From 1c2286d2ad8a3298ed1f056715b9d236243b879e Mon Sep 17 00:00:00 2001
|
||||
From ebc7c34335a94561564edb8af4dc2d606278d61f 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 04dd196cfe8..70dbe2b06bb 100644
|
||||
index eeb6cd63d60..7cc704e56b6 100644
|
||||
--- a/dlls/shell32/Makefile.in
|
||||
+++ b/dlls/shell32/Makefile.in
|
||||
@@ -1,7 +1,7 @@
|
||||
@ -21,10 +21,10 @@ index 04dd196cfe8..70dbe2b06bb 100644
|
||||
-IMPORTS = uuid shlwapi user32 gdi32 advapi32
|
||||
+IMPORTS = uuid shlwapi user32 gdi32 advapi32 aclui
|
||||
DELAYIMPORTS = ole32 oleaut32 shdocvw version comctl32 gdiplus
|
||||
# AUTHORS file is in the top-level directory
|
||||
EXTRAINCL = -I$(top_srcdir)
|
||||
|
||||
C_SRCS = \
|
||||
diff --git a/dlls/shell32/shell32.rc b/dlls/shell32/shell32.rc
|
||||
index eb03982f6a9..c6280edac6b 100644
|
||||
index 264947d337d..90898b7ed98 100644
|
||||
--- a/dlls/shell32/shell32.rc
|
||||
+++ b/dlls/shell32/shell32.rc
|
||||
@@ -202,6 +202,33 @@ the folder?"
|
||||
@ -62,7 +62,7 @@ index eb03982f6a9..c6280edac6b 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 6290cd0f9c8..0c62b6271c3 100644
|
||||
index 6c05904bb91..43cbea2ec87 100644
|
||||
--- a/dlls/shell32/shlview_cmenu.c
|
||||
+++ b/dlls/shell32/shlview_cmenu.c
|
||||
@@ -39,14 +39,133 @@
|
||||
@ -199,7 +199,7 @@ index 6290cd0f9c8..0c62b6271c3 100644
|
||||
typedef struct
|
||||
{
|
||||
IContextMenu3 IContextMenu3_iface;
|
||||
@@ -649,6 +768,269 @@ error:
|
||||
@@ -638,6 +757,269 @@ error:
|
||||
heap_free(props);
|
||||
}
|
||||
|
||||
@ -469,7 +469,7 @@ index 6290cd0f9c8..0c62b6271c3 100644
|
||||
#define MAX_PROP_PAGES 99
|
||||
|
||||
static void DoOpenProperties(ContextMenu *This, HWND hwnd)
|
||||
@@ -731,6 +1113,7 @@ static void DoOpenProperties(ContextMenu *This, HWND hwnd)
|
||||
@@ -717,6 +1099,7 @@ static void DoOpenProperties(ContextMenu *This, HWND hwnd)
|
||||
if (SUCCEEDED(ret))
|
||||
{
|
||||
init_file_properties_pages(lpDo, Properties_AddPropSheetCallback, (LPARAM)&psh);
|
||||
|
||||
@ -1 +1 @@
|
||||
9f6e39e8b945466180080d470e1272ba4f807b3a
|
||||
6b724c3dd8d1ae83e90d4e7e9ec191016fabc7d0
|
||||
|
||||
Loading…
Reference in New Issue
Block a user