diff --git a/patches/dbghelp-EnumerateLoadedModulesExW/0001-dbghelp-Implement-EnumerateLoadedModulesExW.patch b/patches/dbghelp-EnumerateLoadedModulesExW/0001-dbghelp-Implement-EnumerateLoadedModulesExW.patch new file mode 100644 index 00000000..07d6897c --- /dev/null +++ b/patches/dbghelp-EnumerateLoadedModulesExW/0001-dbghelp-Implement-EnumerateLoadedModulesExW.patch @@ -0,0 +1,47 @@ +From fe5d45b540dccdb589978118b7c2828414e21331 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Michael=20M=C3=BCller?= +Date: Mon, 16 May 2016 18:00:49 +0200 +Subject: dbghelp: Implement EnumerateLoadedModulesExW. + +--- + dlls/dbghelp/dbghelp.spec | 2 +- + dlls/dbghelp/module.c | 10 ++++++++++ + 2 files changed, 11 insertions(+), 1 deletion(-) + +diff --git a/dlls/dbghelp/dbghelp.spec b/dlls/dbghelp/dbghelp.spec +index 6004f95..624e023 100644 +--- a/dlls/dbghelp/dbghelp.spec ++++ b/dlls/dbghelp/dbghelp.spec +@@ -5,7 +5,7 @@ + @ stdcall EnumerateLoadedModules(long ptr ptr) + @ stdcall EnumerateLoadedModules64(long ptr ptr) + @ stub EnumerateLoadedModulesEx +-@ stub EnumerateLoadedModulesExW ++@ stub EnumerateLoadedModulesExW(long ptr ptr) + @ stdcall EnumerateLoadedModulesW64(long ptr ptr) + @ stdcall ExtensionApiVersion() + @ stdcall FindDebugInfoFile(str str ptr) +diff --git a/dlls/dbghelp/module.c b/dlls/dbghelp/module.c +index 69a043c..f22ee65 100644 +--- a/dlls/dbghelp/module.c ++++ b/dlls/dbghelp/module.c +@@ -921,6 +921,16 @@ BOOL WINAPI EnumerateLoadedModulesW64(HANDLE hProcess, + } + + /****************************************************************** ++ * EnumerateLoadedModulesExW (DBGHELP.@) ++ * ++ */ ++BOOL WINAPI EnumerateLoadedModulesExW(HANDLE process, PENUMLOADED_MODULES_CALLBACKW64 callback, ++ PVOID context) ++{ ++ return EnumerateLoadedModulesW64(process, callback, context); ++} ++ ++/****************************************************************** + * SymGetModuleInfo (DBGHELP.@) + * + */ +-- +2.8.0 + diff --git a/patches/dbghelp-EnumerateLoadedModulesExW/definition b/patches/dbghelp-EnumerateLoadedModulesExW/definition new file mode 100644 index 00000000..6b0d8f94 --- /dev/null +++ b/patches/dbghelp-EnumerateLoadedModulesExW/definition @@ -0,0 +1 @@ +Fixes: [40614] Implement dbghelp.EnumerateLoadedModulesExW diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index 3e2df50a..9e01c0bd 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -124,6 +124,7 @@ patch_enable_all () enable_d3dx9_36_Texture_Align="$1" enable_d3dx9_36_UpdateSkinnedMesh="$1" enable_dbghelp_Debug_Symbols="$1" + enable_dbghelp_EnumerateLoadedModulesExW="$1" enable_ddraw_D3DFINDDEVICERESULT="$1" enable_ddraw_Device_Caps="$1" enable_ddraw_EnumSurfaces="$1" @@ -546,6 +547,9 @@ patch_enable () dbghelp-Debug_Symbols) enable_dbghelp_Debug_Symbols="$2" ;; + dbghelp-EnumerateLoadedModulesExW) + enable_dbghelp_EnumerateLoadedModulesExW="$2" + ;; ddraw-D3DFINDDEVICERESULT) enable_ddraw_D3DFINDDEVICERESULT="$2" ;; @@ -3219,6 +3223,21 @@ if test "$enable_dbghelp_Debug_Symbols" -eq 1; then ) >> "$patchlist" fi +# Patchset dbghelp-EnumerateLoadedModulesExW +# | +# | This patchset fixes the following Wine bugs: +# | * [#40614] Implement dbghelp.EnumerateLoadedModulesExW +# | +# | Modified files: +# | * dlls/dbghelp/dbghelp.spec, dlls/dbghelp/module.c +# | +if test "$enable_dbghelp_EnumerateLoadedModulesExW" -eq 1; then + patch_apply dbghelp-EnumerateLoadedModulesExW/0001-dbghelp-Implement-EnumerateLoadedModulesExW.patch + ( + echo '+ { "Michael Müller", "dbghelp: Implement EnumerateLoadedModulesExW.", 1 },'; + ) >> "$patchlist" +fi + # Patchset ddraw-D3DFINDDEVICERESULT # | # | Modified files: