From 799d4514094522f1fe2f159b8e610df5df1c7beb Mon Sep 17 00:00:00 2001 From: Alistair Leslie-Hughes Date: Sat, 5 Jun 2021 12:58:08 +1000 Subject: [PATCH] Added api-ms-win-core-psapi-K32GetModuleInformation patchset --- ...psapi-l1-1-0-Add-K32GetModuleBaseNam.patch | 27 +++++++++++++++++++ ...psapi-ansi-l1-1-0-add-K32GetModuleBa.patch | 25 +++++++++++++++++ .../definition | 1 + patches/patchinstall.sh | 18 +++++++++++++ 4 files changed, 71 insertions(+) create mode 100644 patches/api-ms-win-core-psapi-K32GetModuleInformation/0001-api-ms-win-core-psapi-l1-1-0-Add-K32GetModuleBaseNam.patch create mode 100644 patches/api-ms-win-core-psapi-K32GetModuleInformation/0002-api-ms-win-core-psapi-ansi-l1-1-0-add-K32GetModuleBa.patch create mode 100644 patches/api-ms-win-core-psapi-K32GetModuleInformation/definition diff --git a/patches/api-ms-win-core-psapi-K32GetModuleInformation/0001-api-ms-win-core-psapi-l1-1-0-Add-K32GetModuleBaseNam.patch b/patches/api-ms-win-core-psapi-K32GetModuleInformation/0001-api-ms-win-core-psapi-l1-1-0-Add-K32GetModuleBaseNam.patch new file mode 100644 index 00000000..a53254b7 --- /dev/null +++ b/patches/api-ms-win-core-psapi-K32GetModuleInformation/0001-api-ms-win-core-psapi-l1-1-0-Add-K32GetModuleBaseNam.patch @@ -0,0 +1,27 @@ +From ebf3df9837ac6707fe831722c7ed24ccd80f95ce Mon Sep 17 00:00:00 2001 +From: Thomas Crider +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 +--- + .../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 + diff --git a/patches/api-ms-win-core-psapi-K32GetModuleInformation/0002-api-ms-win-core-psapi-ansi-l1-1-0-add-K32GetModuleBa.patch b/patches/api-ms-win-core-psapi-K32GetModuleInformation/0002-api-ms-win-core-psapi-ansi-l1-1-0-add-K32GetModuleBa.patch new file mode 100644 index 00000000..26c77820 --- /dev/null +++ b/patches/api-ms-win-core-psapi-K32GetModuleInformation/0002-api-ms-win-core-psapi-ansi-l1-1-0-add-K32GetModuleBa.patch @@ -0,0 +1,25 @@ +From c96b3a0632721f8849fb1d8404272b5007c1d1b4 Mon Sep 17 00:00:00 2001 +From: Thomas Crider +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 +--- + .../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 + diff --git a/patches/api-ms-win-core-psapi-K32GetModuleInformation/definition b/patches/api-ms-win-core-psapi-K32GetModuleInformation/definition new file mode 100644 index 00000000..017c6282 --- /dev/null +++ b/patches/api-ms-win-core-psapi-K32GetModuleInformation/definition @@ -0,0 +1 @@ +Fixes: [51199] Add missing api-ms-win-core-psapi forwards diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index b34d1fbf..7ca85082 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -87,6 +87,7 @@ 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" @@ -306,6 +307,9 @@ 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" ;; @@ -1517,6 +1521,20 @@ 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: