diff --git a/patches/hnetcfg-INetFwAuthorizedApplication/0001-hnetcfg-Improve-INetFwAuthorizedApplication-get_Proc.patch b/patches/hnetcfg-INetFwAuthorizedApplication/0001-hnetcfg-Improve-INetFwAuthorizedApplication-get_Proc.patch deleted file mode 100644 index 3a743a39..00000000 --- a/patches/hnetcfg-INetFwAuthorizedApplication/0001-hnetcfg-Improve-INetFwAuthorizedApplication-get_Proc.patch +++ /dev/null @@ -1,78 +0,0 @@ -From 1b1bec9415d3ed3ada5ed6fbc5e4d9a30797cbc9 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Michael=20M=C3=BCller?= -Date: Sat, 31 Oct 2015 02:27:14 +0100 -Subject: hnetcfg: Improve - INetFwAuthorizedApplication::get_ProcessImageFileName stub. - ---- - dlls/hnetcfg/apps.c | 26 ++++++++++++++++++++++++-- - 1 file changed, 24 insertions(+), 2 deletions(-) - -diff --git a/dlls/hnetcfg/apps.c b/dlls/hnetcfg/apps.c -index d21ed98..7a8d5e8 100644 ---- a/dlls/hnetcfg/apps.c -+++ b/dlls/hnetcfg/apps.c -@@ -38,6 +38,7 @@ typedef struct fw_app - { - INetFwAuthorizedApplication INetFwAuthorizedApplication_iface; - LONG refs; -+ BSTR filename; - } fw_app; - - static inline fw_app *impl_from_INetFwAuthorizedApplication( INetFwAuthorizedApplication *iface ) -@@ -60,6 +61,7 @@ static ULONG WINAPI fw_app_Release( - if (!refs) - { - TRACE("destroying %p\n", fw_app); -+ if (fw_app->filename) SysFreeString( fw_app->filename ); - HeapFree( GetProcessHeap(), 0, fw_app ); - } - return refs; -@@ -250,7 +252,18 @@ static HRESULT WINAPI fw_app_get_ProcessImageFileName( - fw_app *This = impl_from_INetFwAuthorizedApplication( iface ); - - FIXME("%p, %p\n", This, imageFileName); -- return E_NOTIMPL; -+ -+ if (!imageFileName) -+ return E_INVALIDARG; -+ -+ if (!This->filename) -+ { -+ *imageFileName = NULL; -+ return S_OK; -+ } -+ -+ *imageFileName = SysAllocString( This->filename ); -+ return *imageFileName ? S_OK : E_OUTOFMEMORY; - } - - static HRESULT WINAPI fw_app_put_ProcessImageFileName( -@@ -260,7 +273,15 @@ static HRESULT WINAPI fw_app_put_ProcessImageFileName( - fw_app *This = impl_from_INetFwAuthorizedApplication( iface ); - - FIXME("%p, %s\n", This, debugstr_w(imageFileName)); -- return S_OK; -+ -+ if (!imageFileName) -+ { -+ This->filename = NULL; -+ return S_OK; -+ } -+ -+ This->filename = SysAllocString( imageFileName ); -+ return This->filename ? S_OK : E_OUTOFMEMORY; - } - - static HRESULT WINAPI fw_app_get_IpVersion( -@@ -383,6 +404,7 @@ HRESULT NetFwAuthorizedApplication_create( IUnknown *pUnkOuter, LPVOID *ppObj ) - - fa->INetFwAuthorizedApplication_iface.lpVtbl = &fw_app_vtbl; - fa->refs = 1; -+ fa->filename = NULL; - - *ppObj = &fa->INetFwAuthorizedApplication_iface; - --- -2.6.1 - diff --git a/patches/hnetcfg-INetFwAuthorizedApplication/definition b/patches/hnetcfg-INetFwAuthorizedApplication/definition deleted file mode 100644 index 88f2636b..00000000 --- a/patches/hnetcfg-INetFwAuthorizedApplication/definition +++ /dev/null @@ -1 +0,0 @@ -Fixes: Improve INetFwAuthorizedApplication::get_ProcessImageFileName stub diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index 245cfa09..0622e629 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -52,7 +52,7 @@ usage() # Get the upstream commit sha upstream_commit() { - echo "a373054b72f396a04ab4f191e1f6c2c9e0476aa0" + echo "ee7756fdfd46cd64a09089def3c330a3b262cdd5" } # Show version information @@ -159,7 +159,6 @@ patch_enable_all () enable_gdi32_Path_Metafile="$1" enable_gdi32_Symbol_Truetype_Font="$1" enable_gdiplus_Performance_Improvements="$1" - enable_hnetcfg_INetFwAuthorizedApplication="$1" enable_imagehlp_BindImageEx="$1" enable_imagehlp_Cleanup="$1" enable_imagehlp_ImageLoad="$1" @@ -667,9 +666,6 @@ patch_enable () gdiplus-Performance-Improvements) enable_gdiplus_Performance_Improvements="$2" ;; - hnetcfg-INetFwAuthorizedApplication) - enable_hnetcfg_INetFwAuthorizedApplication="$2" - ;; imagehlp-BindImageEx) enable_imagehlp_BindImageEx="$2" ;; @@ -3961,18 +3957,6 @@ if test "$enable_gdiplus_Performance_Improvements" -eq 1; then ) >> "$patchlist" fi -# Patchset hnetcfg-INetFwAuthorizedApplication -# | -# | Modified files: -# | * dlls/hnetcfg/apps.c -# | -if test "$enable_hnetcfg_INetFwAuthorizedApplication" -eq 1; then - patch_apply hnetcfg-INetFwAuthorizedApplication/0001-hnetcfg-Improve-INetFwAuthorizedApplication-get_Proc.patch - ( - printf '%s\n' '+ { "Michael Müller", "hnetcfg: Improve INetFwAuthorizedApplication::get_ProcessImageFileName stub.", 1 },'; - ) >> "$patchlist" -fi - # Patchset imagehlp-BindImageEx # | # | This patchset fixes the following Wine bugs: