[commit] r2069 - in trunk: GME/Core GME/Interfaces GME/Mga Install SDK/BON/Common

GMESRC Repository Notifications gme-commit at list.isis.vanderbilt.edu
Thu Sep 27 13:11:30 CDT 2012


Author: ksmyth
Date: Thu Sep 27 13:11:27 2012
New Revision: 2069

Log:
Fix some proxy issues

Modified:
   trunk/GME/Core/Core.dll.manifest
   trunk/GME/Interfaces/Mga.idl
   trunk/GME/Mga/Mga.dll.manifest
   trunk/Install/GME_bin.wxs
   trunk/SDK/BON/Common/Console.cpp

Modified: trunk/GME/Core/Core.dll.manifest
==============================================================================
--- trunk/GME/Core/Core.dll.manifest	Wed Sep 26 09:55:28 2012	(r2068)
+++ trunk/GME/Core/Core.dll.manifest	Thu Sep 27 13:11:27 2012	(r2069)
@@ -30,7 +30,7 @@
   <comInterfaceExternalProxyStub name="ICoreAttribute" iid="{826A8738-563B-11D3-B301-005004D38590}" tlbid="{9E9AAACF-28B8-11D3-B36C-0060082DF884}" proxyStubClsid32="{00020424-0000-0000-C000-000000000046}"></comInterfaceExternalProxyStub>
   <comInterfaceExternalProxyStub name="ICoreAttributes" iid="{43D12127-22CA-11D3-A6EC-0060082DF884}" tlbid="{9E9AAACF-28B8-11D3-B36C-0060082DF884}" proxyStubClsid32="{00020424-0000-0000-C000-000000000046}"></comInterfaceExternalProxyStub>
   <comInterfaceExternalProxyStub name="ICoreTerritory" iid="{4C3A57C3-8DFF-11D3-B336-005004D38590}" tlbid="{9E9AAACF-28B8-11D3-B36C-0060082DF884}" proxyStubClsid32="{00020424-0000-0000-C000-000000000046}"></comInterfaceExternalProxyStub>
-  <comInterfaceExternalProxyStub name="ISupportErrorInfo" iid="{DF0B3D60-548F-101B-8E65-08002B2BD119}" tlbid="{9E9AAACF-28B8-11D3-B36C-0060082DF884}" proxyStubClsid32="{DF0B3D60-548F-101B-8E65-08002B2BD119}"></comInterfaceExternalProxyStub>
+  <comInterfaceExternalProxyStub name="ISupportErrorInfo" iid="{DF0B3D60-548F-101B-8E65-08002B2BD119}" tlbid="{9E9AAACF-28B8-11D3-B36C-0060082DF884}" proxyStubClsid32="{00020424-0000-0000-C000-000000000046}"></comInterfaceExternalProxyStub>
   <comInterfaceExternalProxyStub name="IGMEVersionInfo" iid="{9A228010-020B-11D2-BBB3-0040051F7117}" tlbid="{9E9AAACF-28B8-11D3-B36C-0060082DF884}" proxyStubClsid32="{00020424-0000-0000-C000-000000000046}"></comInterfaceExternalProxyStub>
   <comInterfaceExternalProxyStub name="ICoreObjects" iid="{43D12111-22CA-11D3-A6EC-0060082DF884}" tlbid="{9E9AAACF-28B8-11D3-B36C-0060082DF884}" proxyStubClsid32="{00020424-0000-0000-C000-000000000046}"></comInterfaceExternalProxyStub>
 

Modified: trunk/GME/Interfaces/Mga.idl
==============================================================================
--- trunk/GME/Interfaces/Mga.idl	Wed Sep 26 09:55:28 2012	(r2068)
+++ trunk/GME/Interfaces/Mga.idl	Thu Sep 27 13:11:27 2012	(r2069)
@@ -609,6 +609,7 @@
 [
 	object,
 	uuid(11BB44D9-2E2C-11D3-B36D-0060082DF884),
+	oleautomation,
 	helpstring("IMgaComponentEx Interface"),
 	pointer_default(unique)
 

Modified: trunk/GME/Mga/Mga.dll.manifest
==============================================================================
--- trunk/GME/Mga/Mga.dll.manifest	Wed Sep 26 09:55:28 2012	(r2068)
+++ trunk/GME/Mga/Mga.dll.manifest	Thu Sep 27 13:11:27 2012	(r2069)
@@ -74,7 +74,7 @@
   <comInterfaceExternalProxyStub name="IMgaComponents" iid="{C8CDA760-C1FD-11D3-9AD2-00AA00B6FE26}" tlbid="{270B4F86-B17C-11D3-9AD1-00AA00B6FE26}" proxyStubClsid32="{00020424-0000-0000-C000-000000000046}"></comInterfaceExternalProxyStub>
   <comInterfaceExternalProxyStub name="IMgaClients" iid="{C9D8DF93-C1FD-11D3-9AD2-00AA00B6FE26}" tlbid="{270B4F86-B17C-11D3-9AD1-00AA00B6FE26}" proxyStubClsid32="{00020424-0000-0000-C000-000000000046}"></comInterfaceExternalProxyStub>
   <comInterfaceExternalProxyStub name="IMgaClient" iid="{F07EE1A2-2D53-449B-A2DA-45A1A9110E53}" tlbid="{270B4F86-B17C-11D3-9AD1-00AA00B6FE26}" proxyStubClsid32="{00020424-0000-0000-C000-000000000046}"></comInterfaceExternalProxyStub>
-  <comInterfaceExternalProxyStub name="IMgaComponentEx" iid="{11BB44D9-2E2C-11D3-B36D-0060082DF884}" tlbid="{270B4F86-B17C-11D3-9AD1-00AA00B6FE26}" proxyStubClsid32="{11BB44D9-2E2C-11D3-B36D-0060082DF884}"></comInterfaceExternalProxyStub>
+  <comInterfaceExternalProxyStub name="IMgaComponentEx" iid="{11BB44D9-2E2C-11D3-B36D-0060082DF884}" tlbid="{270B4F86-B17C-11D3-9AD1-00AA00B6FE26}" proxyStubClsid32="{00020424-0000-0000-C000-000000000046}"></comInterfaceExternalProxyStub>
   <comInterfaceExternalProxyStub name="IMgaAtom" iid="{270B4F9C-B17C-11D3-9AD1-00AA00B6FE26}" tlbid="{270B4F86-B17C-11D3-9AD1-00AA00B6FE26}" proxyStubClsid32="{00020424-0000-0000-C000-000000000046}"></comInterfaceExternalProxyStub>
   <comInterfaceExternalProxyStub name="IMgaReference" iid="{83BA3233-B758-11D3-ABAE-000000000000}" tlbid="{270B4F86-B17C-11D3-9AD1-00AA00B6FE26}" proxyStubClsid32="{00020424-0000-0000-C000-000000000046}"></comInterfaceExternalProxyStub>
   <comInterfaceExternalProxyStub name="IMgaSet" iid="{83BA3235-B758-11D3-ABAE-000000000000}" tlbid="{270B4F86-B17C-11D3-9AD1-00AA00B6FE26}" proxyStubClsid32="{00020424-0000-0000-C000-000000000046}"></comInterfaceExternalProxyStub>

Modified: trunk/Install/GME_bin.wxs
==============================================================================
--- trunk/Install/GME_bin.wxs	Wed Sep 26 09:55:28 2012	(r2068)
+++ trunk/Install/GME_bin.wxs	Thu Sep 27 13:11:27 2012	(r2069)
@@ -488,6 +488,7 @@
               </Class>
             </AppId>
             <Interface Id="{11BB02D9-2E2C-11D3-B36D-0060082DF884}" Name="IMgaComponent" ProxyStubClassId32="{00020424-0000-0000-C000-000000000046}" />
+            <Interface Id="{11BB44D9-2E2C-11D3-B36D-0060082DF884}" Name="IMgaComponentEx" ProxyStubClassId32="{00020424-0000-0000-C000-000000000046}" />
             <Interface Id="{270B4F92-B17C-11D3-9AD1-00AA00B6FE26}" Name="IMgaProject" ProxyStubClassId32="{00020424-0000-0000-C000-000000000046}" />
             <Interface Id="{270B4F96-B17C-11D3-9AD1-00AA00B6FE26}" Name="IMgaFolder" ProxyStubClassId32="{00020424-0000-0000-C000-000000000046}" />
             <Interface Id="{270B4F98-B17C-11D3-9AD1-00AA00B6FE26}" Name="IMgaFCO" ProxyStubClassId32="{00020424-0000-0000-C000-000000000046}" />

Modified: trunk/SDK/BON/Common/Console.cpp
==============================================================================
--- trunk/SDK/BON/Common/Console.cpp	Wed Sep 26 09:55:28 2012	(r2068)
+++ trunk/SDK/BON/Common/Console.cpp	Thu Sep 27 13:11:27 2012	(r2069)
@@ -11,7 +11,7 @@
 	{
 		CComPtr<IMgaClient> client;	
 		CComQIPtr<IDispatch> pDispatch;
-		HRESULT s1 = project->GetClientByName(L"GME.Application", &client);
+		HRESULT s1 = project->GetClientByName(CComBSTR(L"GME.Application"), &client);
 
 		if ((SUCCEEDED(s1)) && (client != 0))
 		{


More information about the gme-commit mailing list