From 4966b421fc49002b381ad83923ca31938c42a53f Mon Sep 17 00:00:00 2001 From: Zebediah Figura Date: Sat, 3 Sep 2022 14:49:30 -0500 Subject: [PATCH] windows.networking.connectivity-new-dll: Remove manual WinRT class registration. widl generates these now. --- patches/patchinstall.sh | 5 +- ...networking.connectivity-Registry-DLL.patch | 79 ------------------- 2 files changed, 2 insertions(+), 82 deletions(-) delete mode 100644 patches/windows.networking.connectivity-new-dll/0006-windows.networking.connectivity-Registry-DLL.patch diff --git a/patches/patchinstall.sh b/patches/patchinstall.sh index 0fc154b9..79560925 100755 --- a/patches/patchinstall.sh +++ b/patches/patchinstall.sh @@ -3268,8 +3268,8 @@ fi # | * [#46534] Implement INetworkInformationStatics interface # | # | Modified files: -# | * configure.ac, dlls/windows.networking.connectivity/Makefile.in, dlls/windows.networking.connectivity/network.rgs, -# | dlls/windows.networking.connectivity/rsrc.rc, dlls/windows.networking.connectivity/windows.networking.connectivity.spec, +# | * configure.ac, dlls/windows.networking.connectivity/Makefile.in, +# | dlls/windows.networking.connectivity/windows.networking.connectivity.spec, # | dlls/windows.networking.connectivity/windows.networking.connectivity_main.c, include/Makefile.in, # | include/windows.networking.connectivity.idl, include/windows.networking.idl # | @@ -3279,7 +3279,6 @@ if test "$enable_windows_networking_connectivity_new_dll" -eq 1; then patch_apply windows.networking.connectivity-new-dll/0003-windows.networking.connectivity-Add-stub-dll.patch patch_apply windows.networking.connectivity-new-dll/0004-windows.networking.connectivity-Implement-IActivatio.patch patch_apply windows.networking.connectivity-new-dll/0005-windows.networking.connectivity-Implement-INetworkIn.patch - patch_apply windows.networking.connectivity-new-dll/0006-windows.networking.connectivity-Registry-DLL.patch patch_apply windows.networking.connectivity-new-dll/0007-windows.networking.connectivity-Implement-INetworkIn.patch patch_apply windows.networking.connectivity-new-dll/0008-windows.networking.connectivity-IConnectionProfile-G.patch fi diff --git a/patches/windows.networking.connectivity-new-dll/0006-windows.networking.connectivity-Registry-DLL.patch b/patches/windows.networking.connectivity-new-dll/0006-windows.networking.connectivity-Registry-DLL.patch deleted file mode 100644 index 89236af3..00000000 --- a/patches/windows.networking.connectivity-new-dll/0006-windows.networking.connectivity-Registry-DLL.patch +++ /dev/null @@ -1,79 +0,0 @@ -From 911464a8aba1d14e5191daf47501e39f78b3c9a1 Mon Sep 17 00:00:00 2001 -From: Alistair Leslie-Hughes -Date: Mon, 31 May 2021 09:45:56 +1000 -Subject: [PATCH 6/8] windows.networking.connectivity: Registry DLL - -This is a temp solution until the IDL can used for registration. ---- - .../Makefile.in | 3 +++ - .../network.rgs | 19 ++++++++++++++++++ - dlls/windows.networking.connectivity/rsrc.rc | 20 +++++++++++++++++++ - 3 files changed, 42 insertions(+) - create mode 100644 dlls/windows.networking.connectivity/network.rgs - create mode 100644 dlls/windows.networking.connectivity/rsrc.rc - -diff --git a/dlls/windows.networking.connectivity/Makefile.in b/dlls/windows.networking.connectivity/Makefile.in -index 6fc24a72feb..5785430da2c 100644 ---- a/dlls/windows.networking.connectivity/Makefile.in -+++ b/dlls/windows.networking.connectivity/Makefile.in -@@ -5,3 +5,6 @@ EXTRADLLFLAGS = -mno-cygwin - - C_SRCS = \ - windows.networking.connectivity_main.c -+ -+RC_SRCS = rsrc.rc -+ -diff --git a/dlls/windows.networking.connectivity/network.rgs b/dlls/windows.networking.connectivity/network.rgs -new file mode 100644 -index 00000000000..59d6f739a72 ---- /dev/null -+++ b/dlls/windows.networking.connectivity/network.rgs -@@ -0,0 +1,19 @@ -+HKLM -+{ -+ NoRemove Software -+ { -+ NoRemove Microsoft -+ { -+ NoRemove WindowsRuntime -+ { -+ NoRemove ActivatableClassId -+ { -+ ForceRemove Windows.Networking.Connectivity.NetworkInformation -+ { -+ val 'DllPath' = s '%MODULE%' -+ } -+ } -+ } -+ } -+ } -+} -diff --git a/dlls/windows.networking.connectivity/rsrc.rc b/dlls/windows.networking.connectivity/rsrc.rc -new file mode 100644 -index 00000000000..3ebeb3a7000 ---- /dev/null -+++ b/dlls/windows.networking.connectivity/rsrc.rc -@@ -0,0 +1,20 @@ -+/* -+ * Copyright 2021 Alistair Leslie-Hughes -+ * -+ * This library is free software; you can redistribute it and/or -+ * modify it under the terms of the GNU Lesser General Public -+ * License as published by the Free Software Foundation; either -+ * version 2.1 of the License, or (at your option) any later version. -+ * -+ * This library is distributed in the hope that it will be useful, -+ * but WITHOUT ANY WARRANTY; without even the implied warranty of -+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -+ * Lesser General Public License for more details. -+ * -+ * You should have received a copy of the GNU Lesser General Public -+ * License along with this library; if not, write to the Free Software -+ * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA -+ */ -+ -+/* @makedep: network.rgs */ -+1 WINE_REGISTRY network.rgs --- -2.30.2 -