From 1bec48302b145fd691120921dec8a074890ba930 Mon Sep 17 00:00:00 2001 From: Zebediah Figura Date: Sat, 17 Feb 2018 18:51:37 -0600 Subject: [PATCH] Remove rasapi32-RasGetConnectionStatistics. Fixed by https://source.winehq.org/git/wine.git/commit/290aec59aa18e0bdd481c9ae36e24a75e1254bc8 --- patches/patchinstall.sh | 16 ------ ...-stub-for-RasGetConnectionStatistics.patch | 52 ------------------- .../definition | 1 - 3 files changed, 69 deletions(-) delete mode 100644 patches/rasapi32-RasGetConnectionStatistics/0001-rasapi32-Add-stub-for-RasGetConnectionStatistics.patch delete mode 100644 patches/rasapi32-RasGetConnectionStatistics/definition diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index a853b1ad..56423700 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -317,7 +317,6 @@ patch_enable_all () enable_packager_DllMain="$1" enable_quartz_MediaSeeking_Positions="$1" enable_quartz_Silence_FIXMEs="$1" - enable_rasapi32_RasGetConnectionStatistics="$1" enable_riched20_Class_Tests="$1" enable_riched20_IText_Interface="$1" enable_rpcrt4_Race_Condition="$1" @@ -1212,9 +1211,6 @@ patch_enable () quartz-Silence_FIXMEs) enable_quartz_Silence_FIXMEs="$2" ;; - rasapi32-RasGetConnectionStatistics) - enable_rasapi32_RasGetConnectionStatistics="$2" - ;; riched20-Class_Tests) enable_riched20_Class_Tests="$2" ;; @@ -7242,18 +7238,6 @@ if test "$enable_quartz_Silence_FIXMEs" -eq 1; then ) >> "$patchlist" fi -# Patchset rasapi32-RasGetConnectionStatistics -# | -# | Modified files: -# | * dlls/rasapi32/rasapi.c, dlls/rasapi32/rasapi32.spec, include/raserror.h -# | -if test "$enable_rasapi32_RasGetConnectionStatistics" -eq 1; then - patch_apply rasapi32-RasGetConnectionStatistics/0001-rasapi32-Add-stub-for-RasGetConnectionStatistics.patch - ( - printf '%s\n' '+ { "Stanislav Motylkov", "rasapi32: Add stub for RasGetConnectionStatistics.", 1 },'; - ) >> "$patchlist" -fi - # Patchset riched20-Class_Tests # | # | Modified files: diff --git a/patches/rasapi32-RasGetConnectionStatistics/0001-rasapi32-Add-stub-for-RasGetConnectionStatistics.patch b/patches/rasapi32-RasGetConnectionStatistics/0001-rasapi32-Add-stub-for-RasGetConnectionStatistics.patch deleted file mode 100644 index 838fe48e..00000000 --- a/patches/rasapi32-RasGetConnectionStatistics/0001-rasapi32-Add-stub-for-RasGetConnectionStatistics.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 8cb902b407afef95cac06fbc52c42d5e481a610a Mon Sep 17 00:00:00 2001 -From: Stanislav Motylkov -Date: Wed, 4 Oct 2017 23:46:35 +0300 -Subject: rasapi32: Add stub for RasGetConnectionStatistics - ---- - dlls/rasapi32/rasapi.c | 6 ++++++ - dlls/rasapi32/rasapi32.spec | 1 + - include/raserror.h | 1 + - 3 files changed, 8 insertions(+) - -diff --git a/dlls/rasapi32/rasapi.c b/dlls/rasapi32/rasapi.c -index b1721c61752..791b0dab133 100644 ---- a/dlls/rasapi32/rasapi.c -+++ b/dlls/rasapi32/rasapi.c -@@ -547,3 +547,9 @@ DWORD WINAPI RasGetLinkStatistics(HRASCONN connection, DWORD entry, RAS_STATS *s - FIXME("(%p,%u,%p), stub!\n", connection, entry, statistics); - return 0; - } -+ -+DWORD WINAPI RasGetConnectionStatistics(HRASCONN connection, RAS_STATS *statistics) -+{ -+ FIXME("(%p,%p), stub!\n", connection, statistics); -+ return ERROR_UNKNOWN; -+} -diff --git a/dlls/rasapi32/rasapi32.spec b/dlls/rasapi32/rasapi32.spec -index 66b21a657cc..48d7a73dc87 100644 ---- a/dlls/rasapi32/rasapi32.spec -+++ b/dlls/rasapi32/rasapi32.spec -@@ -29,6 +29,7 @@ - @ stdcall RasGetAutodialEnableW(long ptr) - @ stdcall RasGetAutodialParamA(long ptr ptr) - @ stdcall RasGetAutodialParamW(long ptr ptr) -+@ stdcall RasGetConnectionStatistics(ptr ptr) - @ stub RasGetConnectResponse - @ stdcall RasGetConnectStatusA(ptr ptr) - @ stdcall RasGetConnectStatusW(ptr ptr) -diff --git a/include/raserror.h b/include/raserror.h -index 17359368780..549b42423cf 100644 ---- a/include/raserror.h -+++ b/include/raserror.h -@@ -23,6 +23,7 @@ - #define ERROR_BUFFER_TOO_SMALL (RASBASE+3) - #define ERROR_BUFFER_INVALID (RASBASE+10) - #define ERROR_INVALID_SIZE (RASBASE+32) -+#define ERROR_UNKNOWN (RASBASE+35) - #define ERROR_STATE_MACHINES_NOT_STARTED (RASBASE+95) - #define ERROR_RASMAN_CANNOT_INITIALIZE (RASBASE+111) - --- -2.14.1 - diff --git a/patches/rasapi32-RasGetConnectionStatistics/definition b/patches/rasapi32-RasGetConnectionStatistics/definition deleted file mode 100644 index e0a713da..00000000 --- a/patches/rasapi32-RasGetConnectionStatistics/definition +++ /dev/null @@ -1 +0,0 @@ -Fixes: Implement stub for rasapi32.RasGetConnectionStatistics