[commit] r1136 - in branches/Breaking_COM_Changes: GME/Interfaces GME/Meta Install

[GMESRC Repository Notifications]

Author: ksmyth
Date: Fri Jan 14 12:56:30 2011
New Revision: 1136

Log:
Remove duplicate GUIDs: MgaMetaRegNode had 83BA323E-B758-11D3-ABAE-000000000000 which was also MgaRegNode; Meta changed to 0C8065C1-FC2B-4759-AEF1-3B18A82A6830. MgaMetaConstraint had 83BA3242-B758-11D3-ABAE-000000000000 which was also MgaConstraint. Meta changed to 9F2DDAA9-4047-4A17-91CF-CBECA92FF85A

Modified:
   branches/Breaking_COM_Changes/GME/Interfaces/Mga.idl
   branches/Breaking_COM_Changes/GME/Meta/MetaLib.idl
   branches/Breaking_COM_Changes/GME/Meta/MgaMetaConstraint.rgs
   branches/Breaking_COM_Changes/GME/Meta/MgaMetaRegNode.rgs
   branches/Breaking_COM_Changes/Install/GME.wxs

Modified: branches/Breaking_COM_Changes/GME/Interfaces/Mga.idl
==============================================================================
--- branches/Breaking_COM_Changes/GME/Interfaces/Mga.idl	Fri Jan 14 12:40:04 2011	(r1135)
+++ branches/Breaking_COM_Changes/GME/Interfaces/Mga.idl	Fri Jan 14 12:56:30 2011	(r1136)
@@ -1169,7 +1169,7 @@
 /*
 [
 	object,
-	uuid(270B4F93-B17C-11D3-9AD1-00AA00B6FE26),
+	uuid(),
 	dual,
 	helpstring("IMgaRefPort Interface"),
 	pointer_default(unique)

Modified: branches/Breaking_COM_Changes/GME/Meta/MetaLib.idl
==============================================================================
--- branches/Breaking_COM_Changes/GME/Meta/MetaLib.idl	Fri Jan 14 12:40:04 2011	(r1135)
+++ branches/Breaking_COM_Changes/GME/Meta/MetaLib.idl	Fri Jan 14 12:56:30 2011	(r1136)
@@ -26,7 +26,7 @@
 	enum attval_enum;
 
 	[
-		uuid(83BA323E-B758-11D3-ABAE-000000000000),
+		uuid(0C8065C1-FC2B-4759-AEF1-3B18A82A6830),
 		noncreatable,
 		helpstring("MgaMetaRegNode Class")
 	]
@@ -36,7 +36,7 @@
 	};
 
 	[
-		uuid(83BA3242-B758-11D3-ABAE-000000000000),
+		uuid(9F2DDAA9-4047-4A17-91CF-CBECA92FF85A),
 		noncreatable,
 		helpstring("MgaMetaConstraint Class")
 	]

Modified: branches/Breaking_COM_Changes/GME/Meta/MgaMetaConstraint.rgs
==============================================================================
--- branches/Breaking_COM_Changes/GME/Meta/MgaMetaConstraint.rgs	Fri Jan 14 12:40:04 2011	(r1135)
+++ branches/Breaking_COM_Changes/GME/Meta/MgaMetaConstraint.rgs	Fri Jan 14 12:56:30 2011	(r1136)
@@ -2,16 +2,16 @@
 {
 	Mga.MgaMetaConstraint.1 = s 'MgaMetaConstraint Class'
 	{
-		CLSID = s '{83BA3242-B758-11D3-ABAE-000000000000}'
+		CLSID = s '{9F2DDAA9-4047-4A17-91CF-CBECA92FF85A}'
 	}
 	Mga.MgaMetaConstraint = s 'MgaMetaConstraint Class'
 	{
-		CLSID = s '{83BA3242-B758-11D3-ABAE-000000000000}'
+		CLSID = s '{9F2DDAA9-4047-4A17-91CF-CBECA92FF85A}'
 		CurVer = s 'Mga.MgaMetaConstraint.1'
 	}
 	NoRemove CLSID
 	{
-		ForceRemove {83BA3242-B758-11D3-ABAE-000000000000} = s 'MgaMetaConstraint Class'
+		ForceRemove {9F2DDAA9-4047-4A17-91CF-CBECA92FF85A} = s 'MgaMetaConstraint Class'
 		{
 			ProgID = s 'Mga.MgaMetaConstraint.1'
 			VersionIndependentProgID = s 'Mga.MgaMetaConstraint'

Modified: branches/Breaking_COM_Changes/GME/Meta/MgaMetaRegNode.rgs
==============================================================================
--- branches/Breaking_COM_Changes/GME/Meta/MgaMetaRegNode.rgs	Fri Jan 14 12:40:04 2011	(r1135)
+++ branches/Breaking_COM_Changes/GME/Meta/MgaMetaRegNode.rgs	Fri Jan 14 12:56:30 2011	(r1136)
@@ -2,16 +2,16 @@
 {
 	Mga.MgaMetaRegNode.1 = s 'MgaMetaRegNode Class'
 	{
-		CLSID = s '{83BA323E-B758-11D3-ABAE-000000000000}'
+		CLSID = s '{0C8065C1-FC2B-4759-AEF1-3B18A82A6830}'
 	}
 	Mga.MgaMetaRegNode = s 'MgaMetaRegNode Class'
 	{
-		CLSID = s '{83BA323E-B758-11D3-ABAE-000000000000}'
+		CLSID = s '{0C8065C1-FC2B-4759-AEF1-3B18A82A6830}'
 		CurVer = s 'Mga.MgaMetaRegNode.1'
 	}
 	NoRemove CLSID
 	{
-		ForceRemove {83BA323E-B758-11D3-ABAE-000000000000} = s 'MgaMetaRegNode Class'
+		ForceRemove {0C8065C1-FC2B-4759-AEF1-3B18A82A6830} = s 'MgaMetaRegNode Class'
 		{
 			ProgID = s 'Mga.MgaMetaRegNode.1'
 			VersionIndependentProgID = s 'Mga.MgaMetaRegNode'

Modified: branches/Breaking_COM_Changes/Install/GME.wxs
==============================================================================
--- branches/Breaking_COM_Changes/Install/GME.wxs	Fri Jan 14 12:40:04 2011	(r1135)
+++ branches/Breaking_COM_Changes/Install/GME.wxs	Fri Jan 14 12:56:30 2011	(r1136)
@@ -513,12 +513,12 @@
                                 <ProgId Id="Mga.MgaMetaPointerItem" Description="MgaMetaPointerItem Class" />
                             </ProgId>
                         </Class>
-                        <Class Id="{83BA323E-B758-11D3-ABAE-000000000000}" Context="InprocServer32" Description="MgaMetaRegNode Class" ThreadingModel="apartment" Programmable="yes">
+                        <Class Id="{0C8065C1-FC2B-4759-AEF1-3B18A82A6830}" Context="InprocServer32" Description="MgaMetaRegNode Class" ThreadingModel="apartment" Programmable="yes">
                             <ProgId Id="Mga.MgaMetaRegNode.1" Description="MgaMetaRegNode Class">
                                 <ProgId Id="Mga.MgaMetaRegNode" Description="MgaMetaRegNode Class" />
                             </ProgId>
                         </Class>
-                        <Class Id="{83BA3242-B758-11D3-ABAE-000000000000}" Context="InprocServer32" Description="MgaMetaConstraint Class" ThreadingModel="apartment" Programmable="yes">
+                        <Class Id="{9F2DDAA9-4047-4A17-91CF-CBECA92FF85A}" Context="InprocServer32" Description="MgaMetaConstraint Class" ThreadingModel="apartment" Programmable="yes">
                             <ProgId Id="Mga.MgaMetaConstraint.1" Description="MgaMetaConstraint Class">
                                 <ProgId Id="Mga.MgaMetaConstraint" Description="MgaMetaConstraint Class" />
                             </ProgId>