[svn] GpgOL - r257 - trunk/src

[svn author wk]

Author: wk
Date: 2008-06-12 09:32:09 +0200 (Thu, 12 Jun 2008)
New Revision: 257

Modified:
   trunk/src/ChangeLog
   trunk/src/olflange.cpp
Log:
Remove CLSID Registry key.


Modified: trunk/src/ChangeLog
===================================================================
--- trunk/src/ChangeLog	2008-06-05 10:38:03 UTC (rev 256)
+++ trunk/src/ChangeLog	2008-06-12 07:32:09 UTC (rev 257)
@@ -1,3 +1,7 @@
+2008-06-12  Werner Koch  <wk at g10code.com>
+
+	* olflange.cpp (DllUnregisterServer): Delete CLSIDs.
+
 2008-06-05  Werner Koch  <wk at g10code.com>
 
 	* mimeparser.c (mime_decrypt): Set session number and title.

Modified: trunk/src/olflange.cpp
===================================================================
--- trunk/src/olflange.cpp	2008-06-05 10:38:03 UTC (rev 256)
+++ trunk/src/olflange.cpp	2008-06-12 07:32:09 UTC (rev 257)
@@ -250,12 +250,12 @@
 DllUnregisterServer (void)
 {
   HKEY hkey;
-  CHAR buf[512];
+  CHAR buf[MAX_PATH+1024];
   DWORD ntemp;
   long res;
 
   strcpy (buf, "Software\\Microsoft\\Exchange\\Client\\Extensions");
-  /* create and open key and subkey */
+  /* Create and open key and subkey. */
   res = RegCreateKeyEx (HKEY_LOCAL_MACHINE, buf, 0, NULL, 
 			REG_OPTION_NON_VOLATILE, KEY_ALL_ACCESS, 
 			NULL, &hkey, NULL);
@@ -266,14 +266,18 @@
     }
   RegDeleteValue (hkey, "GpgOL");
   
-  /* set outlook update flag */  
+  /* Set outlook update flag.  */  
   strcpy (buf, "4.0;Outxxx.dll;7;000000000000000;0000000000;OutXXX");
   ntemp = strlen (buf) + 1;
   RegSetValueEx (hkey, "Outlook Setup Extension", 0, 
 		 REG_SZ, (BYTE*) buf, ntemp);
   RegCloseKey (hkey);
 
-  /* Fixme: delet CLSIDs. */
+  /* Delete CLSIDs. */
+  strcpy (buf, "CLSID\\" CLSIDSTR_GPGOL "\\InprocServer32");
+  RegDeleteKey (HKEY_CLASSES_ROOT, buf);
+  strcpy (buf, "CLSID\\" CLSIDSTR_GPGOL);
+  RegDeleteKey (HKEY_CLASSES_ROOT, buf);
   
   return S_OK;
 }