winaccessibility: remove all Registry content/registration code

There is no need to register UAccCOM.

(cherry picked from commit 455c39645e3fe1642679aa478c5b1b5a1d3ab0ae)

Conflicts:
	winaccessibility/source/UAccCOM/UAccCOM.cxx

Change-Id: I37f5c4030abefbd18b6686652a348bc20a05a9db

34 files changed, 13 insertions, 552 deletions

diff --git a/winaccessibility/source/UAccCOM/AccAction.h b/winaccessibility/source/UAccCOM/AccAction.h
index 67e08bbac37e..51a60f1fb99c 100644
--- a/winaccessibility/source/UAccCOM/AccAction.h
+++ b/winaccessibility/source/UAccCOM/AccAction.h
@@ -42,7 +42,7 @@ public:
 
     }
 
-    DECLARE_REGISTRY_RESOURCEID(IDR_ACCACTION)
+    DECLARE_NO_REGISTRY()
 
     BEGIN_COM_MAP(CAccAction)
     COM_INTERFACE_ENTRY(IAccessibleAction)
diff --git a/winaccessibility/source/UAccCOM/AccAction.rgs b/winaccessibility/source/UAccCOM/AccAction.rgs
deleted file mode 100644
index 7b51e7b701cf..000000000000
--- a/winaccessibility/source/UAccCOM/AccAction.rgs
+++ /dev/null
@@ -1,26 +0,0 @@
-HKCR
-{
-	UAccCOM.AccAction.1 = s 'AccAction Class'
-	{
-		CLSID = s '{AA49F20E-BB4E-400D-A5B0-6F5B7B770227}'
-	}
-	UAccCOM.AccAction = s 'AccAction Class'
-	{
-		CLSID = s '{AA49F20E-BB4E-400D-A5B0-6F5B7B770227}'
-		CurVer = s 'UAccCOM.AccAction.1'
-	}
-	NoRemove CLSID
-	{
-		ForceRemove {AA49F20E-BB4E-400D-A5B0-6F5B7B770227} = s 'AccAction Class'
-		{
-			ProgID = s 'UAccCOM.AccAction.1'
-			VersionIndependentProgID = s 'UAccCOM.AccAction'
-			ForceRemove 'Programmable'
-			InprocServer32 = s '%MODULE%'
-			{
-				val ThreadingModel = s 'both'
-			}
-			'TypeLib' = s '{19ECB1B0-9376-4FF9-B580-223FC9C200B8}'
-		}
-	}
-}
diff --git a/winaccessibility/source/UAccCOM/AccComponent.h b/winaccessibility/source/UAccCOM/AccComponent.h
index bafeb364f2ee..817487800f84 100644
--- a/winaccessibility/source/UAccCOM/AccComponent.h
+++ b/winaccessibility/source/UAccCOM/AccComponent.h
@@ -69,9 +69,8 @@ public:
         return E_FAIL;
     }
 
-    DECLARE_REGISTRY_RESOURCEID(IDR_AccComponent)
+    DECLARE_NO_REGISTRY()
 
-    // IAccessibleComponent
 public:
     // IAccessibleComponent
 
diff --git a/winaccessibility/source/UAccCOM/AccComponent.rgs b/winaccessibility/source/UAccCOM/AccComponent.rgs
deleted file mode 100644
index ee87c169e969..000000000000
--- a/winaccessibility/source/UAccCOM/AccComponent.rgs
+++ /dev/null
@@ -1,23 +0,0 @@
-HKCR
-{
-	UAccCOM.AccComponent.1 = s 'AccComponent Class'
-	{
-		CLSID = s '{9FD9BA47-70AF-4160-99F1-526F2B9F111B}'
-	}
-	UAccCOM.AccComponent = s 'AccComponent Class'
-	{
-		CLSID = s '{9FD9BA47-70AF-4160-99F1-526F2B9F111B}'
-	}
-	NoRemove CLSID
-	{
-		ForceRemove {9FD9BA47-70AF-4160-99F1-526F2B9F111B} = s 'AccComponent Class'
-		{
-			ProgID = s 'UAccCOM.AccComponent.1'
-			VersionIndependentProgID = s 'UAccCOM.AccComponent'
-			InprocServer32 = s '%MODULE%'
-			{
-				val ThreadingModel = s 'both'
-			}
-		}
-	}
-}
diff --git a/winaccessibility/source/UAccCOM/AccContext.rgs b/winaccessibility/source/UAccCOM/AccContext.rgs
deleted file mode 100644
index b3e9e3a081da..000000000000
--- a/winaccessibility/source/UAccCOM/AccContext.rgs
+++ /dev/null
@@ -1,23 +0,0 @@
-HKCR
-{
-	UAccCOM.AccContext.1 = s 'AccContext Class'
-	{
-		CLSID = s '{F77CAEC2-F04C-4E74-A36C-F3B557BC59E1}'
-	}
-	UAccCOM.AccContext = s 'AccContext Class'
-	{
-		CLSID = s '{F77CAEC2-F04C-4E74-A36C-F3B557BC59E1}'
-	}
-	NoRemove CLSID
-	{
-		ForceRemove {F77CAEC2-F04C-4E74-A36C-F3B557BC59E1} = s 'AccContext Class'
-		{
-			ProgID = s 'UAccCOM.AccContext.1'
-			VersionIndependentProgID = s 'UAccCOM.AccContext'
-			InprocServer32 = s '%MODULE%'
-			{
-				val ThreadingModel = s 'both'
-			}
-		}
-	}
-}
diff --git a/winaccessibility/source/UAccCOM/AccEditableText.h b/winaccessibility/source/UAccCOM/AccEditableText.h
index c130731b0231..cca02cff9a3b 100644
--- a/winaccessibility/source/UAccCOM/AccEditableText.h
+++ b/winaccessibility/source/UAccCOM/AccEditableText.h
@@ -67,9 +67,8 @@ public:
         return E_FAIL;
     }
 
-    DECLARE_REGISTRY_RESOURCEID(IDR_AccEditableText)
+    DECLARE_NO_REGISTRY()
 
-    // IAccessibleEditableText
 public:
     // IAccessibleEditableText
 
diff --git a/winaccessibility/source/UAccCOM/AccEditableText.rgs b/winaccessibility/source/UAccCOM/AccEditableText.rgs
deleted file mode 100644
index 03aacb325719..000000000000
--- a/winaccessibility/source/UAccCOM/AccEditableText.rgs
+++ /dev/null
@@ -1,23 +0,0 @@
-HKCR
-{
-	UAccCOM.AccEditableText.1 = s 'AccEditableText Class'
-	{
-		CLSID = s '{79CE1450-1F61-48E2-BF76-C07BD10105E2}'
-	}
-	UAccCOM.AccEditableText = s 'AccEditableText Class'
-	{
-		CLSID = s '{79CE1450-1F61-48E2-BF76-C07BD10105E2}'
-	}
-	NoRemove CLSID
-	{
-		ForceRemove {79CE1450-1F61-48E2-BF76-C07BD10105E2} = s 'AccEditableText Class'
-		{
-			ProgID = s 'UAccCOM.AccEditableText.1'
-			VersionIndependentProgID = s 'UAccCOM.AccEditableText'
-			InprocServer32 = s '%MODULE%'
-			{
-				val ThreadingModel = s 'both'
-			}
-		}
-	}
-}
diff --git a/winaccessibility/source/UAccCOM/AccExtendedComponent.rgs b/winaccessibility/source/UAccCOM/AccExtendedComponent.rgs
deleted file mode 100644
index 6039885b357d..000000000000
--- a/winaccessibility/source/UAccCOM/AccExtendedComponent.rgs
+++ /dev/null
@@ -1,23 +0,0 @@
-HKCR
-{
-	UAccCOM.AccExtendedComponent.1 = s 'AccExtendedComponent Class'
-	{
-		CLSID = s '{D91562E1-BE6C-41F3-A34C-E7AA846561A4}'
-	}
-	UAccCOM.AccExtendedComponent = s 'AccExtendedComponent Class'
-	{
-		CLSID = s '{D91562E1-BE6C-41F3-A34C-E7AA846561A4}'
-	}
-	NoRemove CLSID
-	{
-		ForceRemove {D91562E1-BE6C-41F3-A34C-E7AA846561A4} = s 'AccExtendedComponent Class'
-		{
-			ProgID = s 'UAccCOM.AccExtendedComponent.1'
-			VersionIndependentProgID = s 'UAccCOM.AccExtendedComponent'
-			InprocServer32 = s '%MODULE%'
-			{
-				val ThreadingModel = s 'both'
-			}
-		}
-	}
-}
diff --git a/winaccessibility/source/UAccCOM/AccFont.rgs b/winaccessibility/source/UAccCOM/AccFont.rgs
deleted file mode 100644
index c229746dbca6..000000000000
--- a/winaccessibility/source/UAccCOM/AccFont.rgs
+++ /dev/null
@@ -1,23 +0,0 @@
-HKCR
-{
-	UAccCOM.AccFont.1 = s 'AccFont Class'
-	{
-		CLSID = s '{185B9AD9-5D31-4793-888F-A21846BBAEDD}'
-	}
-	UAccCOM.AccFont = s 'AccFont Class'
-	{
-		CLSID = s '{185B9AD9-5D31-4793-888F-A21846BBAEDD}'
-	}
-	NoRemove CLSID
-	{
-		ForceRemove {185B9AD9-5D31-4793-888F-A21846BBAEDD} = s 'AccFont Class'
-		{
-			ProgID = s 'UAccCOM.AccFont.1'
-			VersionIndependentProgID = s 'UAccCOM.AccFont'
-			InprocServer32 = s '%MODULE%'
-			{
-				val ThreadingModel = s 'both'
-			}
-		}
-	}
-}
diff --git a/winaccessibility/source/UAccCOM/AccHyperLink.h b/winaccessibility/source/UAccCOM/AccHyperLink.h
index 7505900cc952..5a01a872bb67 100644
--- a/winaccessibility/source/UAccCOM/AccHyperLink.h
+++ b/winaccessibility/source/UAccCOM/AccHyperLink.h
@@ -54,7 +54,7 @@ public:
     COM_INTERFACE_ENTRY(IUNOXWrapper)
     END_COM_MAP()
 
-    DECLARE_REGISTRY_RESOURCEID(IDR_AccHyperLink)
+    DECLARE_NO_REGISTRY()
 
     static HRESULT WINAPI _SmartQI(void* pv,
                                    REFIID iid, void** ppvObject, DWORD)
diff --git a/winaccessibility/source/UAccCOM/AccHyperLink.rgs b/winaccessibility/source/UAccCOM/AccHyperLink.rgs
deleted file mode 100644
index ceb622ee0e95..000000000000
--- a/winaccessibility/source/UAccCOM/AccHyperLink.rgs
+++ /dev/null
@@ -1,23 +0,0 @@
-HKCR
-{
-	UAccCOM.AccHyperLink.1 = s 'AccHyperLink Class'
-	{
-		CLSID = s '{519A64CD-F6A6-4793-BE50-4E36C4C593EF}'
-	}
-	UAccCOM.AccHyperLink = s 'AccHyperLink Class'
-	{
-		CLSID = s '{519A64CD-F6A6-4793-BE50-4E36C4C593EF}'
-	}
-	NoRemove CLSID
-	{
-		ForceRemove {519A64CD-F6A6-4793-BE50-4E36C4C593EF} = s 'AccHyperLink Class'
-		{
-			ProgID = s 'UAccCOM.AccHyperLink.1'
-			VersionIndependentProgID = s 'UAccCOM.AccHyperLink'
-			InprocServer32 = s '%MODULE%'
-			{
-				val ThreadingModel = s 'both'
-			}
-		}
-	}
-}
diff --git a/winaccessibility/source/UAccCOM/AccHypertext.h b/winaccessibility/source/UAccCOM/AccHypertext.h
index 94c737eec886..3935262dd1d0 100644
--- a/winaccessibility/source/UAccCOM/AccHypertext.h
+++ b/winaccessibility/source/UAccCOM/AccHypertext.h
@@ -68,9 +68,8 @@ public:
         return E_FAIL;
     }
 
-    DECLARE_REGISTRY_RESOURCEID(IDR_AccHypertext)
+    DECLARE_NO_REGISTRY()
 
-    // IAccessibleHypertext
 public:
     // IAccessibleText
 
diff --git a/winaccessibility/source/UAccCOM/AccHypertext.rgs b/winaccessibility/source/UAccCOM/AccHypertext.rgs
deleted file mode 100644
index 6baf54496e6a..000000000000
--- a/winaccessibility/source/UAccCOM/AccHypertext.rgs
+++ /dev/null
@@ -1,23 +0,0 @@
-HKCR
-{
-	UAccCOM.AccHypertext.1 = s 'AccHypertext Class'
-	{
-		CLSID = s '{CC55D71B-1828-4EE0-89E2-C3749CF9C9AB}'
-	}
-	UAccCOM.AccHypertext = s 'AccHypertext Class'
-	{
-		CLSID = s '{CC55D71B-1828-4EE0-89E2-C3749CF9C9AB}'
-	}
-	NoRemove CLSID
-	{
-		ForceRemove {CC55D71B-1828-4EE0-89E2-C3749CF9C9AB} = s 'AccHypertext Class'
-		{
-			ProgID = s 'UAccCOM.AccHypertext.1'
-			VersionIndependentProgID = s 'UAccCOM.AccHypertext'
-			InprocServer32 = s '%MODULE%'
-			{
-				val ThreadingModel = s 'both'
-			}
-		}
-	}
-}
diff --git a/winaccessibility/source/UAccCOM/AccImage.h b/winaccessibility/source/UAccCOM/AccImage.h
index f59e782feed5..4de6a18d50ff 100644
--- a/winaccessibility/source/UAccCOM/AccImage.h
+++ b/winaccessibility/source/UAccCOM/AccImage.h
@@ -66,9 +66,8 @@ public:
         return E_FAIL;
     }
 
-    DECLARE_REGISTRY_RESOURCEID(IDR_AccImage)
+    DECLARE_NO_REGISTRY()
 
-    // IAccessibleImage
 public:
     // IAccessibleImage
 
diff --git a/winaccessibility/source/UAccCOM/AccImage.rgs b/winaccessibility/source/UAccCOM/AccImage.rgs
deleted file mode 100644
index 9be96fd3e777..000000000000
--- a/winaccessibility/source/UAccCOM/AccImage.rgs
+++ /dev/null
@@ -1,23 +0,0 @@
-HKCR
-{
-	UAccCOM.AccImage.1 = s 'AccImage Class'
-	{
-		CLSID = s '{73A45800-7A62-432C-A1A6-BF8852994331}'
-	}
-	UAccCOM.AccImage = s 'AccImage Class'
-	{
-		CLSID = s '{73A45800-7A62-432C-A1A6-BF8852994331}'
-	}
-	NoRemove CLSID
-	{
-		ForceRemove {73A45800-7A62-432C-A1A6-BF8852994331} = s 'AccImage Class'
-		{
-			ProgID = s 'UAccCOM.AccImage.1'
-			VersionIndependentProgID = s 'UAccCOM.AccImage'
-			InprocServer32 = s '%MODULE%'
-			{
-				val ThreadingModel = s 'both'
-			}
-		}
-	}
-}
diff --git a/winaccessibility/source/UAccCOM/AccKeyBinding.rgs b/winaccessibility/source/UAccCOM/AccKeyBinding.rgs
deleted file mode 100644
index 6967bf2b6458..000000000000
--- a/winaccessibility/source/UAccCOM/AccKeyBinding.rgs
+++ /dev/null
@@ -1,23 +0,0 @@
-HKCR
-{
-	UAccCOM.AccKeyBinding.1 = s 'AccKeyBinding Class'
-	{
-		CLSID = s '{98AFE6FB-D748-4313-B4D6-E7B273B6255D}'
-	}
-	UAccCOM.AccKeyBinding = s 'AccKeyBinding Class'
-	{
-		CLSID = s '{98AFE6FB-D748-4313-B4D6-E7B273B6255D}'
-	}
-	NoRemove CLSID
-	{
-		ForceRemove {98AFE6FB-D748-4313-B4D6-E7B273B6255D} = s 'AccKeyBinding Class'
-		{
-			ProgID = s 'UAccCOM.AccKeyBinding.1'
-			VersionIndependentProgID = s 'UAccCOM.AccKeyBinding'
-			InprocServer32 = s '%MODULE%'
-			{
-				val ThreadingModel = s 'both'
-			}
-		}
-	}
-}
diff --git a/winaccessibility/source/UAccCOM/AccRelation.h b/winaccessibility/source/UAccCOM/AccRelation.h
index eec77f015f34..7783ba504936 100644
--- a/winaccessibility/source/UAccCOM/AccRelation.h
+++ b/winaccessibility/source/UAccCOM/AccRelation.h
@@ -44,7 +44,7 @@ public:
     {
             }
 
-    DECLARE_REGISTRY_RESOURCEID(IDR_ACCRELATION)
+    DECLARE_NO_REGISTRY()
 
     DECLARE_PROTECT_FINAL_CONSTRUCT()
 
diff --git a/winaccessibility/source/UAccCOM/AccRelation.rgs b/winaccessibility/source/UAccCOM/AccRelation.rgs
deleted file mode 100644
index 3a7d3d2c6ed1..000000000000
--- a/winaccessibility/source/UAccCOM/AccRelation.rgs
+++ /dev/null
@@ -1,25 +0,0 @@
-HKCR
-{
-	UAccCOM.AccRelation.1 = s 'AccRelation Class'
-	{
-		CLSID = s '{8745CF0C-3104-4BAE-B7D0-D7B1717C006E}'
-	}
-	UAccCOM.AccRelation = s 'AccRelation Class'
-	{
-		CLSID = s '{8745CF0C-3104-4BAE-B7D0-D7B1717C006E}'
-		CurVer = s 'UAccCOM.AccRelation.1'
-	}
-	NoRemove CLSID
-	{
-		ForceRemove {8745CF0C-3104-4BAE-B7D0-D7B1717C006E} = s 'AccRelation Class'
-		{
-			ProgID = s 'UAccCOM.AccRelation.1'
-			VersionIndependentProgID = s 'UAccCOM.AccRelation'
-			InprocServer32 = s '%MODULE%'
-			{
-				val ThreadingModel = s 'Apartment'
-			}
-			'TypeLib' = s '{19ECB1B0-9376-4FF9-B580-223FC9C200B8}'
-		}
-	}
-}
diff --git a/winaccessibility/source/UAccCOM/AccSelection.rgs b/winaccessibility/source/UAccCOM/AccSelection.rgs
deleted file mode 100644
index 484099086c5d..000000000000
--- a/winaccessibility/source/UAccCOM/AccSelection.rgs
+++ /dev/null
@@ -1,23 +0,0 @@
-HKCR
-{
-	UAccCOM.AccSelection.1 = s 'AccSelection Class'
-	{
-		CLSID = s '{9B83B8C3-3592-4C29-8682-559E37368E95}'
-	}
-	UAccCOM.AccSelection = s 'AccSelection Class'
-	{
-		CLSID = s '{9B83B8C3-3592-4C29-8682-559E37368E95}'
-	}
-	NoRemove CLSID
-	{
-		ForceRemove {9B83B8C3-3592-4C29-8682-559E37368E95} = s 'AccSelection Class'
-		{
-			ProgID = s 'UAccCOM.AccSelection.1'
-			VersionIndependentProgID = s 'UAccCOM.AccSelection'
-			InprocServer32 = s '%MODULE%'
-			{
-				val ThreadingModel = s 'both'
-			}
-		}
-	}
-}
diff --git a/winaccessibility/source/UAccCOM/AccTable.h b/winaccessibility/source/UAccCOM/AccTable.h
index 664f0a06f079..ce956f62a541 100644
--- a/winaccessibility/source/UAccCOM/AccTable.h
+++ b/winaccessibility/source/UAccCOM/AccTable.h
@@ -63,9 +63,8 @@ public:
         return E_FAIL;
     }
 
-    DECLARE_REGISTRY_RESOURCEID(IDR_ACCTABLE)
+    DECLARE_NO_REGISTRY()
 
-    // IAccessibleTable
 public:
     // IAccessibleTable
 
diff --git a/winaccessibility/source/UAccCOM/AccTable.rgs b/winaccessibility/source/UAccCOM/AccTable.rgs
deleted file mode 100644
index 7117fe698934..000000000000
--- a/winaccessibility/source/UAccCOM/AccTable.rgs
+++ /dev/null
@@ -1,23 +0,0 @@
-HKCR
-{
-	UAccCOM.AccTable.1 = s 'AccTable Class'
-	{
-		CLSID = s '{92BAA62D-535A-4EAB-9ABB-BFA60B7A6DB6}'
-	}
-	UAccCOM.AccTable = s 'AccTable Class'
-	{
-		CLSID = s '{92BAA62D-535A-4EAB-9ABB-BFA60B7A6DB6}'
-	}
-	NoRemove CLSID
-	{
-		ForceRemove {92BAA62D-535A-4EAB-9ABB-BFA60B7A6DB6} = s 'AccTable Class'
-		{
-			ProgID = s 'UAccCOM.AccTable.1'
-			VersionIndependentProgID = s 'UAccCOM.AccTable'
-			InprocServer32 = s '%MODULE%'
-			{
-				val ThreadingModel = s 'both'
-			}
-		}
-	}
-}
diff --git a/winaccessibility/source/UAccCOM/AccText.h b/winaccessibility/source/UAccCOM/AccText.h
index f0adb9787c59..735afd9e0390 100644
--- a/winaccessibility/source/UAccCOM/AccText.h
+++ b/winaccessibility/source/UAccCOM/AccText.h
@@ -64,9 +64,8 @@ public:
         return E_FAIL;
     }
 
-    DECLARE_REGISTRY_RESOURCEID(IDR_AccText)
+    DECLARE_NO_REGISTRY()
 
-    // IAccessibleText
 public:
     // IAccessibleText
 
diff --git a/winaccessibility/source/UAccCOM/AccText.rgs b/winaccessibility/source/UAccCOM/AccText.rgs
deleted file mode 100644
index 6cb3ebdcfa0a..000000000000
--- a/winaccessibility/source/UAccCOM/AccText.rgs
+++ /dev/null
@@ -1,23 +0,0 @@
-HKCR
-{
-	UAccCOM.AccText.1 = s 'AccText Class'
-	{
-		CLSID = s '{6D8AB08B-CCE9-471E-8A41-35773D5263F5}'
-	}
-	UAccCOM.AccText = s 'AccText Class'
-	{
-		CLSID = s '{6D8AB08B-CCE9-471E-8A41-35773D5263F5}'
-	}
-	NoRemove CLSID
-	{
-		ForceRemove {6D8AB08B-CCE9-471E-8A41-35773D5263F5} = s 'AccText Class'
-		{
-			ProgID = s 'UAccCOM.AccText.1'
-			VersionIndependentProgID = s 'UAccCOM.AccText'
-			InprocServer32 = s '%MODULE%'
-			{
-				val ThreadingModel = s 'both'
-			}
-		}
-	}
-}
diff --git a/winaccessibility/source/UAccCOM/AccValue.h b/winaccessibility/source/UAccCOM/AccValue.h
index bf385be22049..d7e3496896e5 100644
--- a/winaccessibility/source/UAccCOM/AccValue.h
+++ b/winaccessibility/source/UAccCOM/AccValue.h
@@ -67,9 +67,8 @@ public:
         return E_FAIL;
     }
 
-    DECLARE_REGISTRY_RESOURCEID(IDR_AccValue)
+    DECLARE_NO_REGISTRY()
 
-    // IAccessibleValue
 public:
     // IAccessibleValue
 
diff --git a/winaccessibility/source/UAccCOM/AccValue.rgs b/winaccessibility/source/UAccCOM/AccValue.rgs
deleted file mode 100644
index f57f318379ec..000000000000
--- a/winaccessibility/source/UAccCOM/AccValue.rgs
+++ /dev/null
@@ -1,23 +0,0 @@
-HKCR
-{
-	UAccCOM.AccValue.1 = s 'AccValue Class'
-	{
-		CLSID = s '{730A561B-1AF6-49E1-9C04-9A2F48CD8512}'
-	}
-	UAccCOM.AccValue = s 'AccValue Class'
-	{
-		CLSID = s '{730A561B-1AF6-49E1-9C04-9A2F48CD8512}'
-	}
-	NoRemove CLSID
-	{
-		ForceRemove {730A561B-1AF6-49E1-9C04-9A2F48CD8512} = s 'AccValue Class'
-		{
-			ProgID = s 'UAccCOM.AccValue.1'
-			VersionIndependentProgID = s 'UAccCOM.AccValue'
-			InprocServer32 = s '%MODULE%'
-			{
-				val ThreadingModel = s 'both'
-			}
-		}
-	}
-}
diff --git a/winaccessibility/source/UAccCOM/EnumVariant.h b/winaccessibility/source/UAccCOM/EnumVariant.h
index 0a87a3f5df40..30c9e0a62738 100644
--- a/winaccessibility/source/UAccCOM/EnumVariant.h
+++ b/winaccessibility/source/UAccCOM/EnumVariant.h
@@ -46,7 +46,7 @@ public:
 
     virtual ~CEnumVariant() {};
 
-    DECLARE_REGISTRY_RESOURCEID(IDR_ENUMVARIANT)
+    DECLARE_NO_REGISTRY()
 
     DECLARE_PROTECT_FINAL_CONSTRUCT()
 
diff --git a/winaccessibility/source/UAccCOM/EnumVariant.rgs b/winaccessibility/source/UAccCOM/EnumVariant.rgs
deleted file mode 100644
index c5decdc4728f..000000000000
--- a/winaccessibility/source/UAccCOM/EnumVariant.rgs
+++ /dev/null
@@ -1,26 +0,0 @@
-HKCR
-{
-	UAccCOM.EnumVariant.1 = s 'EnumVariant Class'
-	{
-		CLSID = s '{152884E0-268B-4481-9AE7-1B372D3AA97F}'
-	}
-	UAccCOM.EnumVariant = s 'EnumVariant Class'
-	{
-		CLSID = s '{152884E0-268B-4481-9AE7-1B372D3AA97F}'
-		CurVer = s 'UAccCOM.EnumVariant.1'
-	}
-	NoRemove CLSID
-	{
-		ForceRemove {152884E0-268B-4481-9AE7-1B372D3AA97F} = s 'EnumVariant Class'
-		{
-			ProgID = s 'UAccCOM.EnumVariant.1'
-			VersionIndependentProgID = s 'UAccCOM.EnumVariant'
-			ForceRemove 'Programmable'
-			InprocServer32 = s '%MODULE%'
-			{
-				val ThreadingModel = s 'Both'
-			}
-			'TypeLib' = s '{19ECB1B0-9376-4FF9-B580-223FC9C200B8}'
-		}
-	}
-}
diff --git a/winaccessibility/source/UAccCOM/MAccessible.h b/winaccessibility/source/UAccCOM/MAccessible.h
index 69c6e468c2f8..7262cb39b7af 100644
--- a/winaccessibility/source/UAccCOM/MAccessible.h
+++ b/winaccessibility/source/UAccCOM/MAccessible.h
@@ -94,7 +94,8 @@ class ATL_NO_VTABLE CMAccessible :
 public:
     CMAccessible();
     virtual ~CMAccessible();
-    DECLARE_REGISTRY_RESOURCEID(IDR_MACCESSIBLE)
+
+    DECLARE_NO_REGISTRY()
 
     DECLARE_GET_CONTROLLING_UNKNOWN()
 
diff --git a/winaccessibility/source/UAccCOM/MAccessible.rgs b/winaccessibility/source/UAccCOM/MAccessible.rgs
deleted file mode 100644
index 10bd2c02eb94..000000000000
--- a/winaccessibility/source/UAccCOM/MAccessible.rgs
+++ /dev/null
@@ -1,26 +0,0 @@
-HKCR
-{
-	UAccCOM.MAccessible.1 = s 'MAccessible Class'
-	{
-		CLSID = s '{CF8DF8BA-44FE-4B10-BD2E-8C8CB322485F}'
-	}
-	UAccCOM.MAccessible = s 'MAccessible Class'
-	{
-		CLSID = s '{CF8DF8BA-44FE-4B10-BD2E-8C8CB322485F}'
-		CurVer = s 'UAccCOM.MAccessible.1'
-	}
-	NoRemove CLSID
-	{
-		ForceRemove {CF8DF8BA-44FE-4B10-BD2E-8C8CB322485F} = s 'MAccessible Class'
-		{
-			ProgID = s 'UAccCOM.MAccessible.1'
-			VersionIndependentProgID = s 'UAccCOM.MAccessible'
-			ForceRemove 'Programmable'
-			InprocServer32 = s '%MODULE%'
-			{
-				val ThreadingModel = s 'Both'
-			}
-			'TypeLib' = s '{19ECB1B0-9376-4FF9-B580-223FC9C200B8}'
-		}
-	}
-}
diff --git a/winaccessibility/source/UAccCOM/Resource.h b/winaccessibility/source/UAccCOM/Resource.h
index 819b28de2ffc..612c89687ccb 100644
--- a/winaccessibility/source/UAccCOM/Resource.h
+++ b/winaccessibility/source/UAccCOM/Resource.h
@@ -23,37 +23,6 @@
 //
 
 #define IDS_PROJNAME                    100
-#define IDR_MACCESSIBLE                 101
-#define IDR_ENUMVARIANT                 106
-#define IDR_UNOXWRAPPER                 107
-#define IDS_ACCCOMPONENT_DESC           108
-#define IDR_AccComponent                109
-#define IDS_ACCCONTEXT_DESC             110
-#define IDR_AccContext                  111
-#define IDR_ACCRELATION                 112
-#define IDR_ACCACTION                   113
-#define IDS_ACCFONT_DESC                114
-#define IDR_AccFont                     115
-#define IDS_ACCSELECTION_DESC           116
-#define IDR_AccSelection                117
-#define IDS_ACCEXTENDEDCOMPONENT_DESC   118
-#define IDR_AccExtendedComponent        119
-#define IDS_ACCTEXT_DESC                120
-#define IDR_AccText                     121
-#define IDS_ACCEDITABLETEXT_DESC        122
-#define IDR_AccEditableText             123
-#define IDS_ACCHYPERTEXT_DESC           124
-#define IDR_AccHypertext                125
-#define IDS_ACCIMAGE_DESC               126
-#define IDR_AccImage                    127
-#define IDS_ACCVALUE_DESC               128
-#define IDR_AccValue                    129
-#define IDS_ACCTABLE_DESC               130
-#define IDR_ACCTABLE                    131
-#define IDS_ACCHYPERLINK_DESC           132
-#define IDR_AccHyperLink                133
-#define IDS_ACCKEYBINDING_DESC          134
-#define IDR_AccKeyBinding               135
 
 // Next default values for new objects
 //
diff --git a/winaccessibility/source/UAccCOM/UAccCOM.cxx b/winaccessibility/source/UAccCOM/UAccCOM.cxx
index 851464f058f9..52b40a017b3e 100644
--- a/winaccessibility/source/UAccCOM/UAccCOM.cxx
+++ b/winaccessibility/source/UAccCOM/UAccCOM.cxx
@@ -93,21 +93,5 @@ STDAPI DllGetClassObject(REFCLSID rclsid, REFIID riid, LPVOID* ppv)
     return _Module.GetClassObject(rclsid, riid, ppv);
 }
 
-/////////////////////////////////////////////////////////////////////////////
-// DllRegisterServer - Adds entries to the system registry
-
-STDAPI DllRegisterServer(void)
-{
-    // registers object, typelib and all interfaces in typelib
-    return _Module.RegisterServer(TRUE);
-}
-
-/////////////////////////////////////////////////////////////////////////////
-// DllUnregisterServer - Removes entries from the system registry
-
-STDAPI DllUnregisterServer(void)
-{
-    return _Module.UnregisterServer(TRUE);
-}
 
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/winaccessibility/source/UAccCOM/UAccCOM.def b/winaccessibility/source/UAccCOM/UAccCOM.def
index 575a28143316..45baa527b412 100644
--- a/winaccessibility/source/UAccCOM/UAccCOM.def
+++ b/winaccessibility/source/UAccCOM/UAccCOM.def
@@ -3,5 +3,3 @@ LIBRARY      "UAccCOM.DLL"
 EXPORTS
 	DllCanUnloadNow     PRIVATE
 	DllGetClassObject   PRIVATE
-	DllRegisterServer   PRIVATE
-	DllUnregisterServer	PRIVATE
diff --git a/winaccessibility/source/UAccCOM/UAccCOM.rc b/winaccessibility/source/UAccCOM/UAccCOM.rc
index 09255ba9d94e..4579c018f4ae 100644
--- a/winaccessibility/source/UAccCOM/UAccCOM.rc
+++ b/winaccessibility/source/UAccCOM/UAccCOM.rc
@@ -31,41 +31,6 @@
 #undef APSTUDIO_READONLY_SYMBOLS
 
 /////////////////////////////////////////////////////////////////////////////
-// Chinese (P.R.C.) resources
-
-#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_CHS)
-#ifdef _WIN32
-LANGUAGE LANG_CHINESE, SUBLANG_CHINESE_SIMPLIFIED
-#pragma code_page(936)
-#endif //_WIN32
-
-/////////////////////////////////////////////////////////////////////////////
-//
-// REGISTRY
-//
-
-IDR_MACCESSIBLE         REGISTRY DISCARDABLE    "MAccessible.rgs"
-IDR_ENUMVARIANT         REGISTRY DISCARDABLE    "EnumVariant.rgs"
-IDR_UNOXWRAPPER         REGISTRY DISCARDABLE    "UNOXWrapper.rgs"
-IDR_AccComponent        REGISTRY DISCARDABLE    "AccComponent.rgs"
-IDR_AccExtendedComponent REGISTRY DISCARDABLE    "AccExtendedComponent.rgs"
-IDR_ACCRELATION         REGISTRY DISCARDABLE    "AccRelation.rgs"
-IDR_ACCACTION           REGISTRY DISCARDABLE    "AccAction.rgs"
-IDR_AccFont             REGISTRY DISCARDABLE    "AccFont.rgs"
-IDR_AccSelection        REGISTRY DISCARDABLE    "AccSelection.rgs"
-IDR_AccText             REGISTRY DISCARDABLE    "AccText.rgs"
-IDR_AccEditableText     REGISTRY DISCARDABLE    "AccEditableText.rgs"
-IDR_AccImage            REGISTRY DISCARDABLE    "AccImage.rgs"
-IDR_AccValue            REGISTRY DISCARDABLE    "AccValue.rgs"
-IDR_ACCTABLE            REGISTRY DISCARDABLE    "AccTable.rgs"
-IDR_AccHyperLink        REGISTRY DISCARDABLE    "AccHyperLink.rgs"
-IDR_AccHypertext        REGISTRY DISCARDABLE    "AccHypertext.rgs"
-IDR_AccKeyBinding       REGISTRY DISCARDABLE    "AccKeyBinding.rgs"
-#endif    // Chinese (P.R.C.) resources
-/////////////////////////////////////////////////////////////////////////////
-
-
-/////////////////////////////////////////////////////////////////////////////
 // English (U.S.) resources
 
 #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)
@@ -106,27 +71,6 @@ END
 STRINGTABLE DISCARDABLE 
 BEGIN
     IDS_PROJNAME            "UAccCOM"
-    IDS_ACCCOMPONENT_DESC   "AccComponent Class"
-    IDS_ACCCONTEXT_DESC     "AccContext Class"
-END
-
-STRINGTABLE DISCARDABLE 
-BEGIN
-    IDS_ACCFONT_DESC        "AccFont Class"
-    IDS_ACCSELECTION_DESC   "AccSelection Class"
-    IDS_ACCEXTENDEDCOMPONENT_DESC "AccExtendedComponent Class"
-    IDS_ACCTEXT_DESC        "AccText Class"
-    IDS_ACCEDITABLETEXT_DESC "AccEditableText Class"
-    IDS_ACCHYPERTEXT_DESC   "AccHypertext Class"
-    IDS_ACCIMAGE_DESC       "AccImage Class"
-END
-
-STRINGTABLE DISCARDABLE 
-BEGIN
-    IDS_ACCVALUE_DESC       "AccValue Class"
-    IDS_ACCTABLE_DESC       "AccTable Class"
-    IDS_ACCHYPERLINK_DESC   "AccHyperLink Class"
-    IDS_ACCKEYBINDING_DESC  "AccKeyBinding Class"
 END
 
 #endif    // English (U.S.) resources
diff --git a/winaccessibility/source/UAccCOM/UNOXWrapper.rgs b/winaccessibility/source/UAccCOM/UNOXWrapper.rgs
deleted file mode 100644
index 8a52b08ae7f9..000000000000
--- a/winaccessibility/source/UAccCOM/UNOXWrapper.rgs
+++ /dev/null
@@ -1,26 +0,0 @@
-HKCR
-{
-	UAccCOM.UNOXWrapper.1 = s 'UNOXWrapper Class'
-	{
-		CLSID = s '{AA360FB0-BC98-41C1-A885-BB921F5ED601}'
-	}
-	UAccCOM.UNOXWrapper = s 'UNOXWrapper Class'
-	{
-		CLSID = s '{AA360FB0-BC98-41C1-A885-BB921F5ED601}'
-		CurVer = s 'UAccCOM.UNOXWrapper.1'
-	}
-	NoRemove CLSID
-	{
-		ForceRemove {AA360FB0-BC98-41C1-A885-BB921F5ED601} = s 'UNOXWrapper Class'
-		{
-			ProgID = s 'UAccCOM.UNOXWrapper.1'
-			VersionIndependentProgID = s 'UAccCOM.UNOXWrapper'
-			ForceRemove 'Programmable'
-			InprocServer32 = s '%MODULE%'
-			{
-				val ThreadingModel = s 'Apartment'
-			}
-			'TypeLib' = s '{19ECB1B0-9376-4FF9-B580-223FC9C200B8}'
-		}
-	}
-}