From 9c4432f69d91007d02c52c50ba565ca795f44765 Mon Sep 17 00:00:00 2001
From: Alexandre Julliard <julliard@winehq.org>
Date: Fri, 12 Nov 2010 11:49:44 +0100
Subject: [PATCH] atl: Fix the name of the Registrar class id.

---
 dlls/atl/atl.rgs     |  4 ++--
 dlls/atl/registrar.c | 10 +++++-----
 include/atliface.idl |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/dlls/atl/atl.rgs b/dlls/atl/atl.rgs
index 8b1d476b20d..ee432497f78 100644
--- a/dlls/atl/atl.rgs
+++ b/dlls/atl/atl.rgs
@@ -2,10 +2,10 @@ HKCR
 {
     ATL.Registrar = s 'Registrar Class'
     {
-        CLSID = s '%CLSID_ATLRegistrar%'
+        CLSID = s '%CLSID_Registrar%'
     }
     NoRemove CLSID {
-        ForceRemove '%CLSID_ATLRegistrar%' = s 'Registrar Class'
+        ForceRemove '%CLSID_Registrar%' = s 'Registrar Class'
         {
             ProgID = s 'ATL.Registrar'
             InprocServer32 = s '%MODULE%'
diff --git a/dlls/atl/registrar.c b/dlls/atl/registrar.c
index 7076e35c17c..a54860f5aec 100644
--- a/dlls/atl/registrar.c
+++ b/dlls/atl/registrar.c
@@ -743,7 +743,7 @@ HRESULT WINAPI DllGetClassObject(REFCLSID clsid, REFIID riid, LPVOID *ppvObject)
 {
     TRACE("(%s %s %p)\n", debugstr_guid(clsid), debugstr_guid(riid), ppvObject);
 
-    if(IsEqualGUID(&CLSID_ATLRegistrar, clsid)) {
+    if(IsEqualGUID(&CLSID_Registrar, clsid)) {
         *ppvObject = &RegistrarCF;
         return S_OK;
     }
@@ -787,14 +787,14 @@ static HRESULT do_register_dll_server(IRegistrar *pRegistrar, LPCOLESTR wszDll,
 
 static HRESULT do_register_server(BOOL do_register)
 {
-    static const WCHAR CLSID_ATLRegistrarW[] =
-            {'C','L','S','I','D','_','A','T','L','R','e','g','i','s','t','r','a','r',0};
+    static const WCHAR CLSID_RegistrarW[] =
+            {'C','L','S','I','D','_','R','e','g','i','s','t','r','a','r',0};
     static const WCHAR atl_dllW[] = {'a','t','l','.','d','l','l',0};
 
     WCHAR clsid_str[40];
-    const struct _ATL_REGMAP_ENTRY reg_map[] = {{CLSID_ATLRegistrarW, clsid_str}, {NULL,NULL}};
+    const struct _ATL_REGMAP_ENTRY reg_map[] = {{CLSID_RegistrarW, clsid_str}, {NULL,NULL}};
 
-    StringFromGUID2(&CLSID_ATLRegistrar, clsid_str, sizeof(clsid_str)/sizeof(WCHAR));
+    StringFromGUID2(&CLSID_Registrar, clsid_str, sizeof(clsid_str)/sizeof(WCHAR));
     return do_register_dll_server(NULL, atl_dllW, MAKEINTRESOURCEW(101), do_register, reg_map);
 }
 
diff --git a/include/atliface.idl b/include/atliface.idl
index f71bc3af8e4..887338fdb50 100644
--- a/include/atliface.idl
+++ b/include/atliface.idl
@@ -68,7 +68,7 @@ interface IRegistrar : IUnknown
         [in] LPCOLESTR szType);
 }
 
-cpp_quote("DEFINE_GUID(CLSID_ATLRegistrar,0x44ec053a,0x400f,0x11d0,0x9d,0xcd,0x00,0xa0,0xc9,0x03,0x91,0xd3);")
+cpp_quote("DEFINE_GUID(CLSID_Registrar,0x44ec053a,0x400f,0x11d0,0x9d,0xcd,0x00,0xa0,0xc9,0x03,0x91,0xd3);")
 
 cpp_quote("HRESULT WINAPI AtlAxCreateControl(LPCOLESTR,HWND,IStream*,IUnknown**);")
 cpp_quote("HRESULT WINAPI AtlAxCreateControlEx(LPCOLESTR,HWND,IStream*,IUnknown**,IUnknown**,REFIID,IUnknown*);")