urlmon: Converted more registration process to IRegistrar mechanism.

dlls/urlmon/Makefile.in

@@ -19,7 +19,6 @@ C_SRCS = \
 	mk.c \
 	protocol.c \
 	protproxy.c \
-	regsvr.c \
 	sec_mgr.c \
 	session.c \
 	umon.c \

dlls/urlmon/rsrc.rc

@@ -16,6 +16,9 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+/* @makedep: urlmon.rgs */
+1 WINE_REGISTRY urlmon.rgs
+
 /* @makedep: urlmon.inf */
 REGINST REGINST urlmon.inf
 

dlls/urlmon/urlmon.inf

@@ -3,35 +3,11 @@ Signature="$CHICAGO$"
 
 
 [RegisterDll]
-AddReg=Protocols.Reg, ZoneMap.Reg, Zones.Reg, Misc.Reg
+AddReg=ZoneMap.Reg, Zones.Reg
 
 
 [UnregisterDll]
-DelReg=Protocols.Reg, ZoneMap.Reg, Zones.Reg, Misc.Reg
-
-
-[Protocols.Reg]
-HKCR,"PROTOCOLS\Handler\cdl",,,"CDL: Asynchronous Pluggable Protocol Handler"
-HKCR,"PROTOCOLS\Handler\cdl","CLSID",,"%CLSID_CdlProtocol%"
-HKCR,"PROTOCOLS\Handler\file",,,"file:, local: Asynchronous Pluggable Protocol Handler"
-HKCR,"PROTOCOLS\Handler\file","CLSID",,"%CLSID_FileProtocol%"
-HKCR,"PROTOCOLS\Handler\local",,,"file:, local: Asynchronous Pluggable Protocol Handler"
-HKCR,"PROTOCOLS\Handler\local","CLSID",,"%CLSID_FileProtocol%"
-HKCR,"PROTOCOLS\Handler\ftp",,,"ftp: Asynchronous Pluggable Protocol Handler"
-HKCR,"PROTOCOLS\Handler\ftp","CLSID",,"%CLSID_FtpProtocol%"
-HKCR,"PROTOCOLS\Handler\gopher",,,"gopher: Asynchronous Pluggable Protocol Handler"
-HKCR,"PROTOCOLS\Handler\gopher","CLSID",,"%CLSID_GopherProtocol%"
-HKCR,"PROTOCOLS\Handler\http",,,"http: Asynchronous Pluggable Protocol Handler"
-HKCR,"PROTOCOLS\Handler\http","CLSID",,"%CLSID_HttpProtocol%"
-HKCR,"PROTOCOLS\Handler\https",,,"https: Asynchronous Pluggable Protocol Handler"
-HKCR,"PROTOCOLS\Handler\https","CLSID",,"%CLSID_HttpsProtocol%"
-HKCR,"PROTOCOLS\Handler\mk",,,"mk: Asynchronous Pluggable Protocol Handler"
-HKCR,"PROTOCOLS\Filter\deflate",,,"AP Deflate Encoding/Decoding Filter"
-HKCR,"PROTOCOLS\Filter\deflate","CLSID",,"%CLSID_DeCompMimeFilter%"
-HKCR,"PROTOCOLS\Filter\gzip",,,"AP Deflate Encoding/Decoding Filter"
-HKCR,"PROTOCOLS\Filter\gzip","CLSID",,"%CLSID_DeCompMimeFilter%"
-HKCR,"PROTOCOLS\Filter\lzdhtml",,,"AP Deflate Encoding/Decoding Filter"
-HKCR,"PROTOCOLS\Filter\lzdhtml","CLSID",,"%CLSID_DeCompMimeFilter%"
+DelReg=ZoneMap.Reg, Zones.Reg
 
 
 [ZoneMap.Reg]
@@ -451,16 +427,7 @@ HKCU,"%ZONES_UNTRUSTED%","1E05",0x10003,0x10000
 HKLM,"%ZONES_UNTRUSTED%","1E05",0x10003,0x10000
 
 
-[Misc.Reg]
-HKCU,"%INTERNET_SETTINGS%","User Agent",,"%USER_AGENT%"
-
-
 [Strings]
-MODULE="urlmon.dll"
-
-USER_AGENT="Mozilla/4.0 (compatible; MSIE 8.0; Win32)"
-INTERNET_SETTINGS="Software\Microsoft\Windows\CurrentVersion\Internet Settings"
-
 PATH_ZONEMAP="Software\Microsoft\Windows\CurrentVersion\Internet Settings\ZoneMap"
 PATH_ZONEMAP_PROTOCOLS="Software\Microsoft\Windows\CurrentVersion\Internet Settings\ZoneMap\ProtocolDefaults"
 PATH_ZONEMAP_DOMAINS="Software\Microsoft\Windows\CurrentVersion\Internet Settings\ZoneMap\Domains"

dlls/urlmon/urlmon.rgs

+HKCR
+{
+    NoRemove PROTOCOLS
+    {
+        NoRemove Handler
+        {
+            ForceRemove cdl = s 'CDL: Asynchronous Pluggable Protocol Handler'
+            {
+                val CLSID = s '{3dd53d40-7b8b-11d0-b013-00aa0059ce02}'
+            }
+            ForceRemove file = s 'file:, local: Asynchronous Pluggable Protocol Handler'
+            {
+                val CLSID = s '{79eac9e7-baf9-11ce-8c82-00aa004ba90b}'
+            }
+            ForceRemove local = s 'file:, local: Asynchronous Pluggable Protocol Handler'
+            {
+                val CLSID = s '{79eac9e7-baf9-11ce-8c82-00aa004ba90b}'
+            }
+            ForceRemove ftp = s 'ftp: Asynchronous Pluggable Protocol Handler'
+            {
+                val CLSID = s '{79eac9e3-baf9-11ce-8c82-00aa004ba90b}'
+            }
+            ForceRemove gopher = s 'gopher: Asynchronous Pluggable Protocol Handler'
+            {
+                val CLSID = s '{79eac9e4-baf9-11ce-8c82-00aa004ba90b}'
+            }
+            ForceRemove http = s 'http: Asynchronous Pluggable Protocol Handler'
+            {
+                val CLSID = s '{79eac9e2-baf9-11ce-8c82-00aa004ba90b}'
+            }
+            ForceRemove https = s 'https: Asynchronous Pluggable Protocol Handler'
+            {
+                val CLSID = s '{79eac9e5-baf9-11ce-8c82-00aa004ba90b}'
+            }
+            ForceRemove mk = s 'mk: Asynchronous Pluggable Protocol Handler'
+            {
+                val CLSID = s '{79eac9e6-baf9-11ce-8c82-00aa004ba90b}'
+            }
+        }
+        NoRemove Filter
+        {
+            ForceRemove deflate = s 'AP Deflate Encoding/Decoding Filter'
+            {
+                val CLSID = s '{8f6b0360-b80d-11d0-a9b3-006097942311}'
+            }
+            ForceRemove gzip = s 'AP Deflate Encoding/Decoding Filter'
+            {
+                val CLSID = s '{8f6b0360-b80d-11d0-a9b3-006097942311}'
+            }
+            ForceRemove lzdhtml = s 'AP Deflate Encoding/Decoding Filter'
+            {
+                val CLSID = s '{8f6b0360-b80d-11d0-a9b3-006097942311}'
+            }
+        }
+    }
+}
+HKCU
+{
+    NoRemove Software
+    {
+        NoRemove Microsoft
+        {
+            NoRemove Windows
+            {
+                NoRemove CurrentVersion
+                {
+                    NoRemove 'Internet Settings'
+                    {
+                        val 'User Agent' = s 'Mozilla/4.0 (compatible; MSIE 8.0; Win32)'
+                    }
+                }
+            }
+        }
+    }
+}

dlls/urlmon/urlmon_main.c

@@ -26,6 +26,8 @@
 
 #define NO_SHLWAPI_REG
 #include "shlwapi.h"
+#include "advpub.h"
+
 #include "wine/debug.h"
 
 #include "urlmon.h"
@@ -366,6 +368,44 @@ HRESULT WINAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID *ppv)
     return CLASS_E_CLASSNOTAVAILABLE;
 }
 
+static HRESULT register_inf(BOOL doregister)
+{
+    HRESULT (WINAPI *pRegInstall)(HMODULE hm, LPCSTR pszSection, const STRTABLEA* pstTable);
+    HMODULE hAdvpack;
+
+    static const WCHAR wszAdvpack[] = {'a','d','v','p','a','c','k','.','d','l','l',0};
+
+    hAdvpack = LoadLibraryW(wszAdvpack);
+    pRegInstall = (void *)GetProcAddress(hAdvpack, "RegInstall");
+
+    return pRegInstall(hProxyDll, doregister ? "RegisterDll" : "UnregisterDll", NULL);
+}
+
+/***********************************************************************
+ *		DllRegisterServer (URLMON.@)
+ */
+HRESULT WINAPI DllRegisterServer(void)
+{
+    HRESULT hr;
+
+    TRACE("\n");
+
+    hr = URLMON_DllRegisterServer();
+    return SUCCEEDED(hr) ? register_inf(TRUE) : hr;
+}
+
+/***********************************************************************
+ *		DllUnregisterServer (URLMON.@)
+ */
+HRESULT WINAPI DllUnregisterServer(void)
+{
+    HRESULT hr;
+
+    TRACE("\n");
+
+    hr = URLMON_DllUnregisterServer();
+    return SUCCEEDED(hr) ? register_inf(FALSE) : hr;
+}
 
 /***********************************************************************
  *		DllRegisterServerEx (URLMON.@)