Jacek Caban : urlmon: Register CLSID_DeCompMimeFilter.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: eb32e9ec1a1da37a81c99ca162251ade3408abf2
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=eb32e9ec1a1da37a81c99ca162251ade3408abf2

Author: Jacek Caban <jacek at codeweavers.com>
Date:   Thu Apr  2 00:16:31 2009 +0200

urlmon: Register CLSID_DeCompMimeFilter.

---

 dlls/urlmon/regsvr.c   |   23 ++++++++++++-----------
 dlls/urlmon/urlmon.inf |   21 ++++++++++++++++++---
 include/urlmon.idl     |    1 +
 3 files changed, 31 insertions(+), 14 deletions(-)

diff --git a/dlls/urlmon/regsvr.c b/dlls/urlmon/regsvr.c
index 2728ced..9561a23 100644
--- a/dlls/urlmon/regsvr.c
+++ b/dlls/urlmon/regsvr.c
@@ -513,10 +513,10 @@ static struct regsvr_interface const interface_list[] = {
 #define INF_SET_CLSID(clsid)                  \
     do                                        \
     {                                         \
-        static CHAR name[] = "CLSID_" #clsid; \
+        static CHAR name[] = #clsid;          \
                                               \
         pse[i].pszName = name;                \
-        clsids[i++] = &CLSID_ ## clsid;       \
+        clsids[i++] = &clsid;                 \
     } while (0)
 
 static HRESULT register_inf(BOOL doregister)
@@ -525,19 +525,20 @@ static HRESULT register_inf(BOOL doregister)
     HMODULE hAdvpack;
     HRESULT (WINAPI *pRegInstall)(HMODULE hm, LPCSTR pszSection, const STRTABLEA* pstTable);
     STRTABLEA strtable;
-    STRENTRYA pse[7];
-    static CLSID const *clsids[34];
+    STRENTRYA pse[8];
+    static CLSID const *clsids[8];
     unsigned int i = 0;
 
     static const WCHAR wszAdvpack[] = {'a','d','v','p','a','c','k','.','d','l','l',0};
 
-    INF_SET_CLSID(CdlProtocol);
-    INF_SET_CLSID(FileProtocol);
-    INF_SET_CLSID(FtpProtocol);
-    INF_SET_CLSID(GopherProtocol);
-    INF_SET_CLSID(HttpProtocol);
-    INF_SET_CLSID(HttpSProtocol);
-    INF_SET_CLSID(MkProtocol);
+    INF_SET_CLSID(CLSID_CdlProtocol);
+    INF_SET_CLSID(CLSID_FileProtocol);
+    INF_SET_CLSID(CLSID_FtpProtocol);
+    INF_SET_CLSID(CLSID_GopherProtocol);
+    INF_SET_CLSID(CLSID_HttpProtocol);
+    INF_SET_CLSID(CLSID_HttpSProtocol);
+    INF_SET_CLSID(CLSID_MkProtocol);
+    INF_SET_CLSID(CLSID_DeCompMimeFilter);
 
     for(i = 0; i < sizeof(pse)/sizeof(pse[0]); i++) {
         pse[i].pszValue = heap_alloc(39);
diff --git a/dlls/urlmon/urlmon.inf b/dlls/urlmon/urlmon.inf
index efdf4ef..63d88c4 100644
--- a/dlls/urlmon/urlmon.inf
+++ b/dlls/urlmon/urlmon.inf
@@ -3,11 +3,19 @@ Signature="$CHICAGO$"
 
 
 [RegisterDll]
-AddReg=Protocols.Reg, ZoneMap.Reg, Zones.Reg
+AddReg=Classes.Reg, Protocols.Reg, ZoneMap.Reg, Zones.Reg
 
 
 [UnregisterDll]
-DelReg=Protocols.Reg, ZoneMap.Reg, Zones.Reg
+DelReg=Classes.Reg, Protocols.Reg, ZoneMap.Reg, Zones.Reg
+
+
+[Classes.Reg]
+
+;; CLSID_DeCompMimeFilter
+HKCR,"CLSID\%CLSID_DeCompMimeFilter%",,,"AP lzdhtml encoding/decoding Filter"
+HKCR,"CLSID\%CLSID_DeCompMimeFilter%\InProcServer32",,,"%MODULE%"
+HKCR,"CLSID\%CLSID_DeCompMimeFilter%\InProcServer32","ThreadingModel",,"Apartment"
 
 
 [Protocols.Reg]
@@ -26,7 +34,12 @@ 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\Handler\mk","CLSID",,"%CLSID_MkProtocol%"
+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%"
 
 
 [ZoneMap.Reg]
@@ -448,6 +461,8 @@ HKLM,"%ZONES_UNTRUSTED%","1E05",0x10003,0x10000
 
 
 [Strings]
+MODULE="urlmon.dll"
+
 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"
diff --git a/include/urlmon.idl b/include/urlmon.idl
index 1244ca4..93bdd0f 100644
--- a/include/urlmon.idl
+++ b/include/urlmon.idl
@@ -1521,6 +1521,7 @@ cpp_quote("DEFINE_GUID(CLSID_InternetZoneManager, 0x7B8A2D95, 0x0AC9, 0x11D1, 0x
 cpp_quote("DEFINE_GUID(IID_IAsyncMoniker, 0x79EAC9D3, 0xBAF9, 0x11CE, 0x8C, 0x82, 0x00, 0xAA, 0x00, 0x4B, 0xA9, 0x0B);")
 cpp_quote("DEFINE_GUID(IID_IAsyncBindCtx, 0x79EAC9D4, 0xBAF9, 0x11CE, 0x8C, 0x82, 0x00, 0xAA, 0x00, 0x4B, 0xA9, 0x0B);")
 cpp_quote("DEFINE_GUID(CLSID_StdURLMoniker, 0x79EAC9E0, 0xBAF9, 0x11CE, 0x8C, 0x82, 0x00, 0xAA, 0x00, 0x4B, 0xA9, 0x0B);")
+cpp_quote("DEFINE_GUID(CLSID_DeCompMimeFilter, 0x8f6b0360, 0xb80d, 0x11d0, 0xa9,0xb3, 0x00,0x60,0x97,0x94,0x23,0x11);")
 
 cpp_quote("DEFINE_GUID(CLSID_CdlProtocol, 0x3dd53d40, 0x7b8b, 0x11D0, 0xb0,0x13, 0x00,0xaa,0x00,0x59,0xce,0x02);")
 cpp_quote("DEFINE_GUID(CLSID_FileProtocol, 0x79EAC9E7, 0xBAF9, 0x11CE, 0x8C,0x82, 0x00,0xAA,0x00,0x4B,0xA9,0x0B);")