[commit] r1487 - in trunk/GME: Common Gme Gme/AutoRoute
GMESRC Repository Notifications
gme-commit at list.isis.vanderbilt.edu
Wed Aug 31 20:01:29 CDT 2011
Author: ksmyth
Date: Wed Aug 31 20:01:28 2011
New Revision: 1487
Log:
Use #import instead of MIDL headers
Modified:
trunk/GME/Common/CommonImport.h
trunk/GME/Gme/AnnotatorEventSink.h
trunk/GME/Gme/AutoRoute/AutoRouterEdge.cpp
trunk/GME/Gme/DecoratorEventSink.h
trunk/GME/Gme/GMEApp.cpp
trunk/GME/Gme/GMEConsole.cpp
trunk/GME/Gme/GMEDoc.cpp
trunk/GME/Gme/GMEOLEApp.cpp
trunk/GME/Gme/GMEOLEAspect.cpp
trunk/GME/Gme/GMEOLEColl.cpp
trunk/GME/Gme/GMEOLEIt.cpp
trunk/GME/Gme/GMEOLEModel.cpp
trunk/GME/Gme/GMEOLEPanel.cpp
trunk/GME/Gme/GMEView.cpp
trunk/GME/Gme/GMEView.h
trunk/GME/Gme/GUIObject.cpp
trunk/GME/Gme/GuiMeta.cpp
trunk/GME/Gme/ModelPropertiesDlgBar.cpp
trunk/GME/Gme/ParadigmPropertiesDlg.cpp
trunk/GME/Gme/ProjectPropertiesDlg.cpp
trunk/GME/Gme/StdAfx.h
Modified: trunk/GME/Common/CommonImport.h
==============================================================================
--- trunk/GME/Common/CommonImport.h Wed Aug 31 18:21:55 2011 (r1486)
+++ trunk/GME/Common/CommonImport.h Wed Aug 31 20:01:28 2011 (r1487)
@@ -139,3 +139,46 @@
enum mgautil_error
{ E_MGAUTIL_COMPONENTPROXY_NOTINITIALIZED = 0x80737001
} mgautil_error;
+
+
+typedef unsigned long feature_code;
+const unsigned long F_RESIZABLE = 1<<0;
+const unsigned long F_MOUSEEVENTS = 1<<1;
+const unsigned long F_HASLABEL = 1<<2;
+const unsigned long F_HASSTATE = 1<<3;
+const unsigned long F_HASPORTS = 1<<4;
+const unsigned long F_ANIMATION = 1<<5;
+const unsigned long F_IMGPATH = 1<<6;
+const unsigned long F_RESIZEAFTERMOD = 1<<7;
+
+
+typedef enum decorator_error {
+ E_DECORATOR_UNKNOWN_PARAMETER = 0x80737001,
+ E_DECORATOR_INIT_WITH_NULL = 0x80737002,
+ E_DECORATOR_UNINITIALIZED = 0x80737003,
+ E_DECORATOR_LOCISNOTSET = 0x80737004,
+ E_DECORATOR_PORTNOTFOUND = 0x80737005,
+ E_DECORATOR_USING_DEPRECATED_FUNCTION = 0x80737006,
+ E_DECORATOR_NOT_IMPLEMENTED = 0x80737007,
+ S_DECORATOR_EVENT_HANDLED = 0x00737001,
+ S_DECORATOR_EVENT_NOT_HANDLED = 0x00737002
+} decorator_error;
+
+
+typedef enum component_startmode_enum {
+ GME_MAIN_START = 0,
+ GME_BROWSER_START = 1,
+ GME_CONTEXT_START = 2,
+ GME_EMBEDDED_START = 3,
+ GME_MENU_START = 16,
+ GME_BGCONTEXT_START = 18,
+ GME_ICON_START = 32,
+ METAMODEL_CHECK_SYNTAX = 101,
+ CONSTMGR_SHOW_CONSTRAINTS = 102,
+ GME_SILENT_MODE = 128
+} component_startmode_enum;
+
+typedef enum inserttype_enum {
+ ADDITION = 0,
+ MERGE = 1
+} inserttype_enum;
Modified: trunk/GME/Gme/AnnotatorEventSink.h
==============================================================================
--- trunk/GME/Gme/AnnotatorEventSink.h Wed Aug 31 18:21:55 2011 (r1486)
+++ trunk/GME/Gme/AnnotatorEventSink.h Wed Aug 31 20:01:28 2011 (r1487)
@@ -29,8 +29,8 @@
class ATL_NO_VTABLE CAnnotatorEventSink :
public CComObjectRootEx<CComSingleThreadModel>,
- public CComCoClass<CAnnotatorEventSink, &CLSID_AnnotatorEventSink>,
- public ISupportErrorInfoImpl<&IID_IMgaElementDecoratorEvents>,
+ public CComCoClass<CAnnotatorEventSink, &__uuidof(AnnotatorEventSink)>,
+ public ISupportErrorInfoImpl<&__uuidof(IMgaElementDecoratorEvents)>,
public IMgaElementDecoratorEvents
{
protected:
Modified: trunk/GME/Gme/AutoRoute/AutoRouterEdge.cpp
==============================================================================
--- trunk/GME/Gme/AutoRoute/AutoRouterEdge.cpp Wed Aug 31 18:21:55 2011 (r1486)
+++ trunk/GME/Gme/AutoRoute/AutoRouterEdge.cpp Wed Aug 31 20:01:28 2011 (r1487)
@@ -1134,6 +1134,7 @@
ASSERT( ED_MINCOORD <= y && y <= ED_MAXCOORD );
CAutoRouterEdge* insert = order_first;
+ // FIXME: std::sort would be better than insertion sort
while( insert && insert->GetPositionY() < y )
insert = insert->GetOrderNext();
Modified: trunk/GME/Gme/DecoratorEventSink.h
==============================================================================
--- trunk/GME/Gme/DecoratorEventSink.h Wed Aug 31 18:21:55 2011 (r1486)
+++ trunk/GME/Gme/DecoratorEventSink.h Wed Aug 31 20:01:28 2011 (r1487)
@@ -29,8 +29,8 @@
class ATL_NO_VTABLE CDecoratorEventSink :
public CComObjectRootEx<CComSingleThreadModel>,
- public CComCoClass<CDecoratorEventSink, &CLSID_DecoratorEventSink>,
- public ISupportErrorInfoImpl<&IID_IMgaElementDecoratorEvents>,
+ public CComCoClass<CDecoratorEventSink, &__uuidof(DecoratorEventSink)>,
+ public ISupportErrorInfoImpl<&__uuidof(IMgaElementDecoratorEvents)>,
public IMgaElementDecoratorEvents
{
protected:
Modified: trunk/GME/Gme/GMEApp.cpp
==============================================================================
--- trunk/GME/Gme/GMEApp.cpp Wed Aug 31 18:21:55 2011 (r1486)
+++ trunk/GME/Gme/GMEApp.cpp Wed Aug 31 20:01:28 2011 (r1487)
@@ -7,9 +7,6 @@
#include "GMEVersion.h"
-#include "Gme_i.c"
-#include "GmeLib_i.c"
-#include "MgaLib_i.c"
#include "Parser.h"
#include "GMEstd.h"
@@ -173,7 +170,7 @@
else { AfxMessageBox(_T("Registration error: ") + hr); exit(-1); }
}
else if(bFlag && !strcmp(pszParam, "UNREGSERVER")) {
- HRESULT hr = UnRegisterTypeLib(LIBID_GmeLib, 1, 0, LANG_NEUTRAL, SYS_WIN32);
+ HRESULT hr = UnRegisterTypeLib(__uuidof(__GmeLib), 1, 0, LANG_NEUTRAL, SYS_WIN32);
if(hr == S_OK) { AfxMessageBox(_T("Unregistered")); exit(0); }
else { AfxMessageBox(_T("Unregistration error: ") + hr); exit(-1); }
}
@@ -417,7 +414,7 @@
COleObjectFactory::UpdateRegistryAll();
// Make sure the type library is registered or dual interface won't work.
- AfxOleRegisterTypeLib(AfxGetInstanceHandle(), LIBID_GmeLib);
+ AfxOleRegisterTypeLib(AfxGetInstanceHandle(), __uuidof(__GmeLib));
// We don't want a new document at startup
if( cmdInfo.m_nShellCommand == CCommandLineInfo::FileNew )
@@ -744,7 +741,7 @@
CComObjPtr<IMgaTerritory> terry;
- COMTHROW(mgaProject->CreateTerritory(NULL, PutOut(terry)) );
+ COMTHROW(mgaProject->CreateTerritory(NULL, PutOut(terry), NULL) );
CComBSTR nm;
MSGTRY
@@ -1433,7 +1430,7 @@
int answer = AfxMessageBox(_T("The paradigm used to open this file is not the current version\n")
_T("Do you want to upgrade to the current paradigm?") ,MB_YESNO);
if(answer == IDYES) {
- COMTHROW(mgaProject->Close());
+ COMTHROW(mgaProject->Close(VARIANT_FALSE));
// PETER: Create new MgaProject COM object (workaround MGA addon bug)
mgaProject.Release();
@@ -1512,7 +1509,7 @@
void CGMEApp::SaveProject(const CString &conn) {
if( mgaProject != NULL ) {
- HRESULT hr = mgaProject->Save(CComBSTR(conn));
+ HRESULT hr = mgaProject->Save(CComBSTR(conn), VARIANT_FALSE);
if(hr != S_OK) {
AfxMessageBox(_T("ERROR: Could not save project\nCheck access permissions"));
}
@@ -1857,7 +1854,7 @@
// In case of an MGA file, try to save it first to find out
abort_on_close = false;
if(mgaProject != NULL && (proj_type_is_mga||proj_type_is_xmlbackend)) {
- HRESULT hr = mgaProject->Save(NULL);
+ HRESULT hr = mgaProject->Save(NULL, VARIANT_FALSE);
if(hr != S_OK) {
AfxMessageBox(_T("ERROR: Could not save project\nCheck access permissions"));
return false;
@@ -3083,7 +3080,7 @@
if( !mgaProject) return;
CComObjPtr<IMgaTerritory> terry;
- COMTHROW(mgaProject->CreateTerritory(NULL, PutOut(terry)) );
+ COMTHROW(mgaProject->CreateTerritory(NULL, PutOut(terry), NULL) );
LPUNKNOWN objs = CGMEObjectInspector::theInstance->GetObjects();
CComQIPtr<IMgaObjects> one_obj_coll( objs);
Modified: trunk/GME/Gme/GMEConsole.cpp
==============================================================================
--- trunk/GME/Gme/GMEConsole.cpp Wed Aug 31 18:21:55 2011 (r1486)
+++ trunk/GME/Gme/GMEConsole.cpp Wed Aug 31 20:01:28 2011 (r1487)
@@ -103,6 +103,7 @@
void CGMEConsole::Message(CString str, short type)
{
+ // ShowPane(TRUE, FALSE, TRUE);
m_Console.Message(str, type);
}
Modified: trunk/GME/Gme/GMEDoc.cpp
==============================================================================
--- trunk/GME/Gme/GMEDoc.cpp Wed Aug 31 18:21:55 2011 (r1486)
+++ trunk/GME/Gme/GMEDoc.cpp Wed Aug 31 20:01:28 2011 (r1487)
@@ -580,8 +580,8 @@
try {
if (!inTrans) {
- COMTHROW(theApp.mgaProject->CreateTerritory(NULL, &terr));
- COMTHROW(theApp.mgaProject->BeginTransaction(terr));
+ COMTHROW(theApp.mgaProject->CreateTerritory(NULL, &terr, NULL));
+ COMTHROW(theApp.mgaProject->BeginTransaction(terr, TRANSACTION_GENERAL));
}
else {
COMTHROW(theApp.mgaProject->get_ActiveTerritory(&terr));
@@ -596,7 +596,7 @@
try {
CComPtr<IMgaObject> parent;
- COMTHROW(fco->GetParent(&parent));
+ COMTHROW(fco->GetParent(&parent, NULL));
model = NULL;
COMTHROW(parent.QueryInterface(&model));
}
@@ -618,8 +618,8 @@
try
{
if (!inTrans) {
- COMTHROW(theApp.mgaProject->CreateTerritory(NULL, &terr));
- COMTHROW(theApp.mgaProject->BeginTransaction(terr));
+ COMTHROW(theApp.mgaProject->CreateTerritory(NULL, &terr, NULL));
+ COMTHROW(theApp.mgaProject->BeginTransaction(terr, TRANSACTION_GENERAL));
CComPtr<IMgaModel> tmpmod = model; // put model into the active territory
model = NULL;
CComPtr<IMgaFCO> fco_mod;
@@ -627,7 +627,7 @@
COMTHROW( fco_mod.QueryInterface( &model));// casted to IMgaModel
}
CComPtr<IMgaObject> parent;
- COMTHROW(model->GetParent(&parent));
+ COMTHROW(model->GetParent(&parent, NULL));
COMTHROW(model.QueryInterface(&fco));
model = NULL;
COMTHROW(parent.QueryInterface(&model));
@@ -691,8 +691,8 @@
inTrans = (status & 0x08L) != 0;
CComPtr<IMgaTerritory> terr;
if (!inTrans) {
- COMTHROW(theApp.mgaProject->CreateTerritory(NULL, &terr));
- COMTHROW(theApp.mgaProject->BeginTransaction(terr));
+ COMTHROW(theApp.mgaProject->CreateTerritory(NULL, &terr, NULL));
+ COMTHROW(theApp.mgaProject->BeginTransaction(terr, TRANSACTION_GENERAL));
}
else {
COMTHROW(theApp.mgaProject->get_ActiveTerritory(&terr));
@@ -1178,7 +1178,7 @@
bool inTrans = (status & 0x08L) != 0;
CComPtr<IMgaTerritory> terr;
if (!inTrans) {
- COMTHROW(theApp.mgaProject->CreateTerritory(NULL, &terr));
+ COMTHROW(theApp.mgaProject->CreateTerritory(NULL, &terr, NULL));
COMTHROW(theApp.mgaProject->BeginTransaction(terr, TRANSACTION_READ_ONLY));
}
else {
@@ -1234,7 +1234,7 @@
inTrans = (status & 0x08L) != 0;
CComPtr<IMgaTerritory> terr;
if (!inTrans) {
- COMTHROW(theApp.mgaProject->CreateTerritory(NULL, &terr));
+ COMTHROW(theApp.mgaProject->CreateTerritory(NULL, &terr, NULL));
COMTHROW(theApp.mgaProject->BeginTransaction(terr, TRANSACTION_READ_ONLY));
}
else
Modified: trunk/GME/Gme/GMEOLEApp.cpp
==============================================================================
--- trunk/GME/Gme/GMEOLEApp.cpp Wed Aug 31 18:21:55 2011 (r1486)
+++ trunk/GME/Gme/GMEOLEApp.cpp Wed Aug 31 20:01:28 2011 (r1487)
@@ -141,7 +141,7 @@
BEGIN_INTERFACE_MAP(CGMEOLEApp, CCmdTarget)
- INTERFACE_PART(CGMEOLEApp, IID_IGMEOLEApp, Dual)
+ INTERFACE_PART(CGMEOLEApp, __uuidof(IGMEOLEApp), Dual)
DUAL_ERRORINFO_PART(CGMEOLEApp)
END_INTERFACE_MAP()
@@ -779,13 +779,13 @@
// Implement ISupportErrorInfo to indicate we support the
// OLE Automation error handler.
-IMPLEMENT_DUAL_ERRORINFO(CGMEOLEApp, IID_IGMEOLEApp)
+IMPLEMENT_DUAL_ERRORINFO(CGMEOLEApp, __uuidof(IGMEOLEApp))
STDMETHODIMP CGMEOLEApp::XDual::put_Visible( VARIANT_BOOL isVisible)
{
METHOD_PROLOGUE(CGMEOLEApp, Dual)
- TRY_DUAL(IID_IGMEOLEApp)
+ TRY_DUAL(__uuidof(IGMEOLEApp))
{
pThis->SetVisible(isVisible);
return NOERROR;
@@ -798,7 +798,7 @@
{
METHOD_PROLOGUE(CGMEOLEApp, Dual)
- TRY_DUAL(IID_IGMEOLEApp)
+ TRY_DUAL(__uuidof(IGMEOLEApp))
{
#pragma warning(disable: 4310) // cast truncates constant value
*isVisible = (pThis->GetVisible() == FALSE) ? VARIANT_FALSE : VARIANT_TRUE;
@@ -812,7 +812,7 @@
{
METHOD_PROLOGUE(CGMEOLEApp, Dual)
- TRY_DUAL(IID_IGMEOLEApp)
+ TRY_DUAL(__uuidof(IGMEOLEApp))
{
// CString str = pThis->GetVersion();
// str.SetSysString(versionStr);
@@ -826,7 +826,7 @@
{
METHOD_PROLOGUE(CGMEOLEApp, Dual)
- TRY_DUAL(IID_IGMEOLEApp)
+ TRY_DUAL(__uuidof(IGMEOLEApp))
{
*n = pThis->GetVersionMajor();
return NOERROR;
@@ -838,7 +838,7 @@
{
METHOD_PROLOGUE(CGMEOLEApp, Dual)
- TRY_DUAL(IID_IGMEOLEApp)
+ TRY_DUAL(__uuidof(IGMEOLEApp))
{
*n = pThis->GetVersionMinor();
return NOERROR;
@@ -850,7 +850,7 @@
{
METHOD_PROLOGUE(CGMEOLEApp, Dual)
- TRY_DUAL(IID_IGMEOLEApp)
+ TRY_DUAL(__uuidof(IGMEOLEApp))
{
*n = pThis->GetVersionPatchLevel();
return NOERROR;
@@ -862,10 +862,10 @@
{
METHOD_PROLOGUE(CGMEOLEApp, Dual)
- TRY_DUAL(IID_IGMEOLEApp)
+ TRY_DUAL(__uuidof(IGMEOLEApp))
{
LPDISPATCH lpDisp = pThis->GetModels();
- lpDisp->QueryInterface(IID_IGMEOLEColl, (LPVOID*)coll);
+ lpDisp->QueryInterface(__uuidof(IGMEOLEColl), (LPVOID*)coll);
return NOERROR;
}
CATCH_ALL_DUAL
@@ -875,10 +875,10 @@
{
METHOD_PROLOGUE(CGMEOLEApp, Dual)
- TRY_DUAL(IID_IGMEOLEApp)
+ TRY_DUAL(__uuidof(IGMEOLEApp))
{
LPDISPATCH lpDisp = pThis->GetMgaProject();
- lpDisp->QueryInterface(IID_IMgaProject, (LPVOID*)project);
+ lpDisp->QueryInterface(__uuidof(IMgaProject), (LPVOID*)project);
return NOERROR;
}
CATCH_ALL_DUAL
@@ -888,10 +888,10 @@
{
METHOD_PROLOGUE(CGMEOLEApp, Dual)
- TRY_DUAL(IID_IGMEOLEApp)
+ TRY_DUAL(__uuidof(IGMEOLEApp))
{
LPDISPATCH lpDisp = pThis->GetOleIt();
- lpDisp->QueryInterface(IID_IGMEOLEIt, (LPVOID*)model);
+ lpDisp->QueryInterface(__uuidof(IGMEOLEIt), (LPVOID*)model);
lpDisp->Release();
return NOERROR;
}
@@ -902,10 +902,10 @@
{
METHOD_PROLOGUE(CGMEOLEApp, Dual)
- TRY_DUAL(IID_IGMEOLEApp)
+ TRY_DUAL(__uuidof(IGMEOLEApp))
{
LPDISPATCH lpDisp = pThis->GetPanels();
- lpDisp->QueryInterface(IID_IGMEOLEColl, (LPVOID*)coll);
+ lpDisp->QueryInterface(__uuidof(IGMEOLEColl), (LPVOID*)coll);
lpDisp->Release();
return NOERROR;
}
@@ -916,7 +916,7 @@
{
METHOD_PROLOGUE(CGMEOLEApp, Dual)
- TRY_DUAL(IID_IGMEOLEApp)
+ TRY_DUAL(__uuidof(IGMEOLEApp))
{
*contents = pThis->GetConsoleContents();
return NOERROR;
@@ -929,7 +929,7 @@
{
METHOD_PROLOGUE(CGMEOLEApp, Dual)
- TRY_DUAL(IID_IGMEOLEApp)
+ TRY_DUAL(__uuidof(IGMEOLEApp))
{
pThis->SetConsoleContents(CString(contents));
return NOERROR;
@@ -941,7 +941,7 @@
{
METHOD_PROLOGUE(CGMEOLEApp, Dual)
- TRY_DUAL(IID_IGMEOLEApp)
+ TRY_DUAL(__uuidof(IGMEOLEApp))
{
pThis->CreateProject(CString(metaname), CString(connstr));
return NOERROR;
@@ -953,7 +953,7 @@
{
METHOD_PROLOGUE(CGMEOLEApp, Dual)
- TRY_DUAL(IID_IGMEOLEApp)
+ TRY_DUAL(__uuidof(IGMEOLEApp))
{
pThis->OpenProject(CString(connstr));
return NOERROR;
@@ -965,7 +965,7 @@
{
METHOD_PROLOGUE(CGMEOLEApp, Dual)
- TRY_DUAL(IID_IGMEOLEApp)
+ TRY_DUAL(__uuidof(IGMEOLEApp))
{
pThis->CreateProjectDialog();
return NOERROR;
@@ -977,7 +977,7 @@
{
METHOD_PROLOGUE(CGMEOLEApp, Dual)
- TRY_DUAL(IID_IGMEOLEApp)
+ TRY_DUAL(__uuidof(IGMEOLEApp))
{
pThis->OpenProjectDialog();
return NOERROR;
@@ -989,7 +989,7 @@
{
METHOD_PROLOGUE(CGMEOLEApp, Dual)
- TRY_DUAL(IID_IGMEOLEApp)
+ TRY_DUAL(__uuidof(IGMEOLEApp))
{
pThis->CloseProject(saveOnClose);
return NOERROR;
@@ -1001,7 +1001,7 @@
{
METHOD_PROLOGUE(CGMEOLEApp, Dual)
- TRY_DUAL(IID_IGMEOLEApp)
+ TRY_DUAL(__uuidof(IGMEOLEApp))
{
pThis->SaveProject();
return NOERROR;
@@ -1014,7 +1014,7 @@
{
METHOD_PROLOGUE(CGMEOLEApp, Dual)
- TRY_DUAL(IID_IGMEOLEApp)
+ TRY_DUAL(__uuidof(IGMEOLEApp))
{
pThis->SaveProjectAs(CString(connstr));
return NOERROR;
@@ -1026,7 +1026,7 @@
{
METHOD_PROLOGUE(CGMEOLEApp, Dual)
- TRY_DUAL(IID_IGMEOLEApp)
+ TRY_DUAL(__uuidof(IGMEOLEApp))
{
pThis->SaveProjectAsDialog();
return NOERROR;
@@ -1039,7 +1039,7 @@
{
METHOD_PROLOGUE(CGMEOLEApp, Dual)
- TRY_DUAL(IID_IGMEOLEApp)
+ TRY_DUAL(__uuidof(IGMEOLEApp))
{
pThis->ExportProject(CString(connstr));
return NOERROR;
@@ -1051,7 +1051,7 @@
{
METHOD_PROLOGUE(CGMEOLEApp, Dual)
- TRY_DUAL(IID_IGMEOLEApp)
+ TRY_DUAL(__uuidof(IGMEOLEApp))
{
pThis->ImportProject(CString(connstr));
return NOERROR;
@@ -1063,7 +1063,7 @@
{
METHOD_PROLOGUE(CGMEOLEApp, Dual)
- TRY_DUAL(IID_IGMEOLEApp)
+ TRY_DUAL(__uuidof(IGMEOLEApp))
{
pThis->ConstraintsDialog();
return NOERROR;
@@ -1076,7 +1076,7 @@
{
METHOD_PROLOGUE(CGMEOLEApp, Dual)
- TRY_DUAL(IID_IGMEOLEApp)
+ TRY_DUAL(__uuidof(IGMEOLEApp))
{
pThis->CheckAllConstraints();
return NOERROR;
@@ -1089,7 +1089,7 @@
{
METHOD_PROLOGUE(CGMEOLEApp, Dual)
- TRY_DUAL(IID_IGMEOLEApp)
+ TRY_DUAL(__uuidof(IGMEOLEApp))
{
pThis->RegisterParagimsDialog();
return NOERROR;
@@ -1102,7 +1102,7 @@
{
METHOD_PROLOGUE(CGMEOLEApp, Dual)
- TRY_DUAL(IID_IGMEOLEApp)
+ TRY_DUAL(__uuidof(IGMEOLEApp))
{
pThis->RegisterComponentsDialog();
return NOERROR;
@@ -1115,7 +1115,7 @@
{
METHOD_PROLOGUE(CGMEOLEApp, Dual)
- TRY_DUAL(IID_IGMEOLEApp)
+ TRY_DUAL(__uuidof(IGMEOLEApp))
{
pThis->RunComponent(CString(progID));
return NOERROR;
@@ -1128,7 +1128,7 @@
{
METHOD_PROLOGUE(CGMEOLEApp, Dual)
- TRY_DUAL(IID_IGMEOLEApp)
+ TRY_DUAL(__uuidof(IGMEOLEApp))
{
pThis->RunComponentDialog();
return NOERROR;
@@ -1141,7 +1141,7 @@
{
METHOD_PROLOGUE(CGMEOLEApp, Dual)
- TRY_DUAL(IID_IGMEOLEApp)
+ TRY_DUAL(__uuidof(IGMEOLEApp))
{
pThis->SettingsDialog();
return NOERROR;
@@ -1154,7 +1154,7 @@
{
METHOD_PROLOGUE(CGMEOLEApp, Dual)
- TRY_DUAL(IID_IGMEOLEApp)
+ TRY_DUAL(__uuidof(IGMEOLEApp))
{
pThis->Undo();
return NOERROR;
@@ -1167,7 +1167,7 @@
{
METHOD_PROLOGUE(CGMEOLEApp, Dual)
- TRY_DUAL(IID_IGMEOLEApp)
+ TRY_DUAL(__uuidof(IGMEOLEApp))
{
pThis->Redo();
return NOERROR;
@@ -1180,7 +1180,7 @@
{
METHOD_PROLOGUE(CGMEOLEApp, Dual)
- TRY_DUAL(IID_IGMEOLEApp)
+ TRY_DUAL(__uuidof(IGMEOLEApp))
{
pThis->ClearUndoQueue();
return NOERROR;
@@ -1193,7 +1193,7 @@
{
METHOD_PROLOGUE(CGMEOLEApp, Dual)
- TRY_DUAL(IID_IGMEOLEApp)
+ TRY_DUAL(__uuidof(IGMEOLEApp))
{
pThis->ProjectPropertiesDialog();
return NOERROR;
@@ -1206,7 +1206,7 @@
{
METHOD_PROLOGUE(CGMEOLEApp, Dual)
- TRY_DUAL(IID_IGMEOLEApp)
+ TRY_DUAL(__uuidof(IGMEOLEApp))
{
pThis->ShowHelpContents();
return NOERROR;
@@ -1219,7 +1219,7 @@
{
METHOD_PROLOGUE(CGMEOLEApp, Dual)
- TRY_DUAL(IID_IGMEOLEApp)
+ TRY_DUAL(__uuidof(IGMEOLEApp))
{
pThis->ShowAbout();
return NOERROR;
@@ -1232,7 +1232,7 @@
{
METHOD_PROLOGUE(CGMEOLEApp, Dual)
- TRY_DUAL(IID_IGMEOLEApp)
+ TRY_DUAL(__uuidof(IGMEOLEApp))
{
LPDISPATCH lpDisp = NULL;
mgaFCO->QueryInterface(IID_IDispatch, (LPVOID*)&lpDisp);
@@ -1247,7 +1247,7 @@
{
METHOD_PROLOGUE(CGMEOLEApp, Dual)
- TRY_DUAL(IID_IGMEOLEApp)
+ TRY_DUAL(__uuidof(IGMEOLEApp))
{
pThis->ConsoleMessage(CString(msg), type);
return NOERROR;
@@ -1259,7 +1259,7 @@
{
METHOD_PROLOGUE(CGMEOLEApp, Dual)
- TRY_DUAL(IID_IGMEOLEApp)
+ TRY_DUAL(__uuidof(IGMEOLEApp))
{
pThis->ConsoleClear();
return NOERROR;
@@ -1271,7 +1271,7 @@
{
METHOD_PROLOGUE(CGMEOLEApp, Dual)
- TRY_DUAL(IID_IGMEOLEApp)
+ TRY_DUAL(__uuidof(IGMEOLEApp))
{
pThis->ConsoleNavigateTo(CString(url));
return NOERROR;
@@ -1284,7 +1284,7 @@
{
METHOD_PROLOGUE(CGMEOLEApp, Dual)
- TRY_DUAL(IID_IGMEOLEApp)
+ TRY_DUAL(__uuidof(IGMEOLEApp))
{
pThis->ChangeEditmode((long)mode);
return NOERROR;
@@ -1296,7 +1296,7 @@
{
METHOD_PROLOGUE(CGMEOLEApp, Dual)
- TRY_DUAL(IID_IGMEOLEApp)
+ TRY_DUAL(__uuidof(IGMEOLEApp))
{
pThis->GridShow(show);
return NOERROR;
@@ -1308,7 +1308,7 @@
{
METHOD_PROLOGUE(CGMEOLEApp, Dual)
- TRY_DUAL(IID_IGMEOLEApp)
+ TRY_DUAL(__uuidof(IGMEOLEApp))
{
pThis->AttributepanelPage((long)page);
return NOERROR;
@@ -1320,7 +1320,7 @@
{
METHOD_PROLOGUE(CGMEOLEApp, Dual)
- TRY_DUAL(IID_IGMEOLEApp)
+ TRY_DUAL(__uuidof(IGMEOLEApp))
{
pThis->DisableComp( CString( pCompName), pHide);
return NOERROR;
@@ -1332,7 +1332,7 @@
{
METHOD_PROLOGUE(CGMEOLEApp, Dual)
- TRY_DUAL(IID_IGMEOLEApp)
+ TRY_DUAL(__uuidof(IGMEOLEApp))
{
pThis->DisableCompForKinds( CString( pCompName), CString( pKindSequence));
return NOERROR;
@@ -1344,7 +1344,7 @@
{
METHOD_PROLOGUE(CGMEOLEApp, Dual)
- TRY_DUAL(IID_IGMEOLEApp)
+ TRY_DUAL(__uuidof(IGMEOLEApp))
{
pThis->SetCompFiltering( pOn);
return NOERROR;
@@ -1356,7 +1356,7 @@
{
METHOD_PROLOGUE(CGMEOLEApp, Dual)
- TRY_DUAL(IID_IGMEOLEApp)
+ TRY_DUAL(__uuidof(IGMEOLEApp))
{
*pOn = (pThis->GetCompFiltering())?VARIANT_TRUE:VARIANT_FALSE;
return NOERROR;
@@ -1368,7 +1368,7 @@
{
METHOD_PROLOGUE(CGMEOLEApp, Dual)
- TRY_DUAL(IID_IGMEOLEApp)
+ TRY_DUAL(__uuidof(IGMEOLEApp))
{
pThis->SetWorkingDirectory( CString( pPath));
return NOERROR;
@@ -1380,7 +1380,7 @@
{
METHOD_PROLOGUE(CGMEOLEApp, Dual)
- TRY_DUAL(IID_IGMEOLEApp)
+ TRY_DUAL(__uuidof(IGMEOLEApp))
{
pThis->Exit();
return NOERROR;
@@ -1392,7 +1392,7 @@
{
METHOD_PROLOGUE(CGMEOLEApp, Dual)
- TRY_DUAL(IID_IGMEOLEApp)
+ TRY_DUAL(__uuidof(IGMEOLEApp))
{
long res = pThis->RefreshLib( CString( pLibName), pUngroup);
*pNumOfErrors = res;
Modified: trunk/GME/Gme/GMEOLEAspect.cpp
==============================================================================
--- trunk/GME/Gme/GMEOLEAspect.cpp Wed Aug 31 18:21:55 2011 (r1486)
+++ trunk/GME/Gme/GMEOLEAspect.cpp Wed Aug 31 20:01:28 2011 (r1487)
@@ -91,7 +91,7 @@
BEGIN_INTERFACE_MAP(CGMEOLEAspect, CCmdTarget)
- INTERFACE_PART(CGMEOLEAspect, IID_IGMEOLEAspect, Dual)
+ INTERFACE_PART(CGMEOLEAspect, __uuidof(IGMEOLEAspect), Dual)
DUAL_ERRORINFO_PART(CGMEOLEAspect)
END_INTERFACE_MAP()
@@ -156,16 +156,16 @@
// Implement ISupportErrorInfo to indicate we support the
// OLE Automation error handler.
-IMPLEMENT_DUAL_ERRORINFO(CGMEOLEAspect, IID_IGMEOLEAspect)
+IMPLEMENT_DUAL_ERRORINFO(CGMEOLEAspect, __uuidof(IGMEOLEAspect))
STDMETHODIMP CGMEOLEAspect::XDual::get_MgaAspect(IMgaMetaAspect** aspect)
{
METHOD_PROLOGUE(CGMEOLEAspect, Dual)
- TRY_DUAL(IID_IGMEOLEAspect)
+ TRY_DUAL(__uuidof(IGMEOLEAspect))
{
LPDISPATCH lpDisp = pThis->GetMgaAspect();
- lpDisp->QueryInterface(IID_IMgaMetaAspect, (LPVOID*)aspect);
+ lpDisp->QueryInterface(__uuidof(IMgaMetaAspect), (LPVOID*)aspect);
return NOERROR;
}
CATCH_ALL_DUAL
@@ -175,7 +175,7 @@
{
METHOD_PROLOGUE(CGMEOLEAspect, Dual)
- TRY_DUAL(IID_IGMEOLEAspect)
+ TRY_DUAL(__uuidof(IGMEOLEAspect))
{
pThis->SetActive(isActive);
return NOERROR;
@@ -187,7 +187,7 @@
{
METHOD_PROLOGUE(CGMEOLEAspect, Dual)
- TRY_DUAL(IID_IGMEOLEAspect)
+ TRY_DUAL(__uuidof(IGMEOLEAspect))
{
#pragma warning(disable: 4310) // cast truncates constant value
*isActive = (pThis->GetActive() == FALSE) ? VARIANT_FALSE : VARIANT_TRUE;
@@ -201,7 +201,7 @@
{
METHOD_PROLOGUE(CGMEOLEAspect, Dual)
- TRY_DUAL(IID_IGMEOLEAspect)
+ TRY_DUAL(__uuidof(IGMEOLEAspect))
{
#pragma warning(disable: 4310) // cast truncates constant value
*isValid = (pThis->GetValid() == FALSE) ? VARIANT_FALSE : VARIANT_TRUE;
Modified: trunk/GME/Gme/GMEOLEColl.cpp
==============================================================================
--- trunk/GME/Gme/GMEOLEColl.cpp Wed Aug 31 18:21:55 2011 (r1486)
+++ trunk/GME/Gme/GMEOLEColl.cpp Wed Aug 31 20:01:28 2011 (r1487)
@@ -77,7 +77,7 @@
// dispinterface in the .ODL file.
BEGIN_INTERFACE_MAP(CGMEOLEColl, CCmdTarget)
- INTERFACE_PART(CGMEOLEColl, IID_IGMEOLEColl, Dual)
+ INTERFACE_PART(CGMEOLEColl, __uuidof(IGMEOLEColl), Dual)
DUAL_ERRORINFO_PART(CGMEOLEColl)
END_INTERFACE_MAP()
@@ -205,14 +205,14 @@
// Implement ISupportErrorInfo to indicate we support the
// OLE Automation error handler.
-IMPLEMENT_DUAL_ERRORINFO(CGMEOLEColl, IID_IGMEOLEColl)
+IMPLEMENT_DUAL_ERRORINFO(CGMEOLEColl, __uuidof(IGMEOLEColl))
STDMETHODIMP CGMEOLEColl::XDual::get_Count(long *cnt)
{
METHOD_PROLOGUE(CGMEOLEColl, Dual)
- TRY_DUAL(IID_IGMEOLEColl)
+ TRY_DUAL(__uuidof(IGMEOLEColl))
{
*cnt = pThis->GetCount();
return NOERROR;
@@ -224,7 +224,7 @@
{
METHOD_PROLOGUE(CGMEOLEColl, Dual)
- TRY_DUAL(IID_IGMEOLEColl)
+ TRY_DUAL(__uuidof(IGMEOLEColl))
{
pThis->Add(newValue);
return NOERROR;
@@ -236,7 +236,7 @@
{
METHOD_PROLOGUE(CGMEOLEColl, Dual)
- TRY_DUAL(IID_IGMEOLEColl)
+ TRY_DUAL(__uuidof(IGMEOLEColl))
{
*cnt = pThis->Find(findValue);
return NOERROR;
@@ -248,7 +248,7 @@
{
METHOD_PROLOGUE(CGMEOLEColl, Dual)
- TRY_DUAL(IID_IGMEOLEColl)
+ TRY_DUAL(__uuidof(IGMEOLEColl))
{
pThis->Remove(removeValue);
return NOERROR;
@@ -260,7 +260,7 @@
{
METHOD_PROLOGUE(CGMEOLEColl, Dual)
- TRY_DUAL(IID_IGMEOLEColl)
+ TRY_DUAL(__uuidof(IGMEOLEColl))
{
pThis->RemoveAll();
return NOERROR;
@@ -272,7 +272,7 @@
{
METHOD_PROLOGUE(CGMEOLEColl, Dual)
- TRY_DUAL(IID_IGMEOLEColl)
+ TRY_DUAL(__uuidof(IGMEOLEColl))
{
*val = pThis->GetItem(nIndex);
return NOERROR;
@@ -284,7 +284,7 @@
{
METHOD_PROLOGUE(CGMEOLEColl, Dual)
- TRY_DUAL(IID_IGMEOLEColl)
+ TRY_DUAL(__uuidof(IGMEOLEColl))
{
pThis->SetItem(nIndex, newValue);
return NOERROR;
@@ -296,7 +296,7 @@
{
METHOD_PROLOGUE(CGMEOLEColl, Dual)
- TRY_DUAL(IID_IGMEOLEColl)
+ TRY_DUAL(__uuidof(IGMEOLEColl))
{
*e = pThis->GetNewEnum();
return NOERROR;
Modified: trunk/GME/Gme/GMEOLEIt.cpp
==============================================================================
--- trunk/GME/Gme/GMEOLEIt.cpp Wed Aug 31 18:21:55 2011 (r1486)
+++ trunk/GME/Gme/GMEOLEIt.cpp Wed Aug 31 20:01:28 2011 (r1487)
@@ -697,7 +697,7 @@
BEGIN_INTERFACE_MAP(CGMEOLEIt, CCmdTarget)
- INTERFACE_PART(CGMEOLEIt, IID_IGMEOLEIt, Dual)
+ INTERFACE_PART(CGMEOLEIt, __uuidof(IGMEOLEIt), Dual)
DUAL_ERRORINFO_PART(CGMEOLEIt)
END_INTERFACE_MAP()
@@ -2702,7 +2702,7 @@
try
{
CComPtr<IMgaFCOs> coll;
- p_dispColl->QueryInterface(IID_IMgaFCOs, (LPVOID*)&coll);
+ p_dispColl->QueryInterface(__uuidof(IMgaFCOs), (LPVOID*)&coll);
long l = 0;
COMTHROW( coll->get_Count( &l ));
@@ -2964,17 +2964,17 @@
// Implement ISupportErrorInfo to indicate we support the
// OLE Automation error handler.
-IMPLEMENT_DUAL_ERRORINFO(CGMEOLEIt, IID_IGMEOLEIt)
+IMPLEMENT_DUAL_ERRORINFO(CGMEOLEIt, __uuidof(IGMEOLEIt))
STDMETHODIMP CGMEOLEIt::XDual::get_Aspects(IGMEOLEColl** coll)
{
METHOD_PROLOGUE(CGMEOLEIt, Dual)
- TRY_DUAL(IID_IGMEOLEIt)
+ TRY_DUAL(__uuidof(IGMEOLEIt))
{
LPDISPATCH lpDisp = pThis->GetAspects();
- lpDisp->QueryInterface(IID_IGMEOLEColl, (LPVOID*)coll);
+ lpDisp->QueryInterface(__uuidof(IGMEOLEColl), (LPVOID*)coll);
return NOERROR;
}
CATCH_ALL_DUAL
@@ -2984,7 +2984,7 @@
{
METHOD_PROLOGUE(CGMEOLEIt, Dual)
- TRY_DUAL(IID_IGMEOLEIt)
+ TRY_DUAL(__uuidof(IGMEOLEIt))
{
pThis->Print();
return NOERROR;
@@ -2996,7 +2996,7 @@
{
METHOD_PROLOGUE(CGMEOLEIt, Dual)
- TRY_DUAL(IID_IGMEOLEIt)
+ TRY_DUAL(__uuidof(IGMEOLEIt))
{
pThis->PrintDialog();
return NOERROR;
@@ -3009,7 +3009,7 @@
{
METHOD_PROLOGUE(CGMEOLEIt, Dual)
- TRY_DUAL(IID_IGMEOLEIt)
+ TRY_DUAL(__uuidof(IGMEOLEIt))
{
pThis->DumpWindowsMetaFile(CString(filePath));
return NOERROR;
@@ -3022,7 +3022,7 @@
{
METHOD_PROLOGUE(CGMEOLEIt, Dual)
- TRY_DUAL(IID_IGMEOLEIt)
+ TRY_DUAL(__uuidof(IGMEOLEIt))
{
pThis->CheckConstraints();
return NOERROR;
@@ -3035,7 +3035,7 @@
{
METHOD_PROLOGUE(CGMEOLEIt, Dual)
- TRY_DUAL(IID_IGMEOLEIt)
+ TRY_DUAL(__uuidof(IGMEOLEIt))
{
pThis->RunComponent(CString(appID));
return NOERROR;
@@ -3048,7 +3048,7 @@
{
METHOD_PROLOGUE(CGMEOLEIt, Dual)
- TRY_DUAL(IID_IGMEOLEIt)
+ TRY_DUAL(__uuidof(IGMEOLEIt))
{
pThis->RunComponentDialog();
return NOERROR;
@@ -3061,7 +3061,7 @@
{
METHOD_PROLOGUE(CGMEOLEIt, Dual)
- TRY_DUAL(IID_IGMEOLEIt)
+ TRY_DUAL(__uuidof(IGMEOLEIt))
{
pThis->Close();
return NOERROR;
@@ -3074,7 +3074,7 @@
{
METHOD_PROLOGUE(CGMEOLEIt, Dual)
- TRY_DUAL(IID_IGMEOLEIt)
+ TRY_DUAL(__uuidof(IGMEOLEIt))
{
LPDISPATCH lpDisp = NULL;
mgaFCO->QueryInterface(IID_IDispatch, (LPVOID*)&lpDisp);
@@ -3090,7 +3090,7 @@
{
METHOD_PROLOGUE(CGMEOLEIt, Dual)
- TRY_DUAL(IID_IGMEOLEIt)
+ TRY_DUAL(__uuidof(IGMEOLEIt))
{
pThis->GrayOutHide();
return NOERROR;
@@ -3102,7 +3102,7 @@
{
METHOD_PROLOGUE(CGMEOLEIt, Dual)
- TRY_DUAL(IID_IGMEOLEIt)
+ TRY_DUAL(__uuidof(IGMEOLEIt))
{
LPDISPATCH lpDisp = NULL;
mgaFCO->QueryInterface(IID_IDispatch, (LPVOID*)&lpDisp);
@@ -3118,7 +3118,7 @@
{
METHOD_PROLOGUE(CGMEOLEIt, Dual)
- TRY_DUAL(IID_IGMEOLEIt)
+ TRY_DUAL(__uuidof(IGMEOLEIt))
{
pThis->HideSetMembers();
return NOERROR;
@@ -3130,7 +3130,7 @@
{
METHOD_PROLOGUE(CGMEOLEIt, Dual)
- TRY_DUAL(IID_IGMEOLEIt)
+ TRY_DUAL(__uuidof(IGMEOLEIt))
{
pThis->Zoom(percent);
return NOERROR;
@@ -3142,7 +3142,7 @@
{
METHOD_PROLOGUE(CGMEOLEIt, Dual)
- TRY_DUAL(IID_IGMEOLEIt)
+ TRY_DUAL(__uuidof(IGMEOLEIt))
{
pThis->ZoomTo(mgaFCOs);
return NOERROR;
@@ -3154,7 +3154,7 @@
{
METHOD_PROLOGUE(CGMEOLEIt, Dual)
- TRY_DUAL(IID_IGMEOLEIt)
+ TRY_DUAL(__uuidof(IGMEOLEIt))
{
pThis->Scroll(bar, scroll);
return NOERROR;
@@ -3167,7 +3167,7 @@
{
METHOD_PROLOGUE(CGMEOLEIt, Dual)
- TRY_DUAL(IID_IGMEOLEIt)
+ TRY_DUAL(__uuidof(IGMEOLEIt))
{
return pThis->DumpModelGeometryXML(CString(filePath));
}
@@ -3179,7 +3179,7 @@
{
METHOD_PROLOGUE(CGMEOLEIt, Dual)
- TRY_DUAL(IID_IGMEOLEIt)
+ TRY_DUAL(__uuidof(IGMEOLEIt))
{
#pragma warning(disable: 4310) // cast truncates constant value
*p_isActive = (pThis->GetValid() == FALSE) ? VARIANT_FALSE : VARIANT_TRUE;
@@ -3193,10 +3193,10 @@
{
METHOD_PROLOGUE(CGMEOLEIt, Dual)
- TRY_DUAL(IID_IGMEOLEIt)
+ TRY_DUAL(__uuidof(IGMEOLEIt))
{
LPDISPATCH lpDisp = pThis->GetMgaModel();
- lpDisp->QueryInterface(IID_IMgaModel, (LPVOID*)p_pModel);
+ lpDisp->QueryInterface(__uuidof(IMgaModel), (LPVOID*)p_pModel);
return NOERROR;
}
CATCH_ALL_DUAL
@@ -3206,7 +3206,7 @@
{
METHOD_PROLOGUE(CGMEOLEIt, Dual)
- TRY_DUAL(IID_IGMEOLEIt)
+ TRY_DUAL(__uuidof(IGMEOLEIt))
{
pThis->ShowFCO( (LPCTSTR) directory, inParent);
return NOERROR;
@@ -3218,7 +3218,7 @@
{
METHOD_PROLOGUE(CGMEOLEIt, Dual)
- TRY_DUAL(IID_IGMEOLEIt)
+ TRY_DUAL(__uuidof(IGMEOLEIt))
{
pThis->ShowFCOPtr( child, inParent);
return NOERROR;
@@ -3230,10 +3230,10 @@
{
METHOD_PROLOGUE(CGMEOLEIt, Dual)
- TRY_DUAL(IID_IGMEOLEIt)
+ TRY_DUAL(__uuidof(IGMEOLEIt))
{
LPDISPATCH lpDisp = pThis->Child( (LPCTSTR) child_name);
- lpDisp->QueryInterface(IID_IMgaFCO, (LPVOID*) new_fco);
+ lpDisp->QueryInterface(__uuidof(IMgaFCO), (LPVOID*) new_fco);
return NOERROR;
}
CATCH_ALL_DUAL
@@ -3243,10 +3243,10 @@
{
METHOD_PROLOGUE(CGMEOLEIt, Dual)
- TRY_DUAL(IID_IGMEOLEIt)
+ TRY_DUAL(__uuidof(IGMEOLEIt))
{
LPDISPATCH lpDisp = pThis->Create( (LPCTSTR)part, (LPCTSTR)name);
- lpDisp->QueryInterface(IID_IMgaFCO, (LPVOID*) new_fco);
+ lpDisp->QueryInterface(__uuidof(IMgaFCO), (LPVOID*) new_fco);
return NOERROR;
}
CATCH_ALL_DUAL
@@ -3256,10 +3256,10 @@
{
METHOD_PROLOGUE(CGMEOLEIt, Dual)
- TRY_DUAL(IID_IGMEOLEIt)
+ TRY_DUAL(__uuidof(IGMEOLEIt))
{
LPDISPATCH lpDisp = pThis->CreateInChild( (LPCTSTR) child_as_parent, (LPCTSTR) part, (LPCTSTR) name);
- lpDisp->QueryInterface(IID_IMgaFCO, (LPVOID*) new_fco);
+ lpDisp->QueryInterface(__uuidof(IMgaFCO), (LPVOID*) new_fco);
return NOERROR;
}
CATCH_ALL_DUAL
@@ -3269,10 +3269,10 @@
{
METHOD_PROLOGUE(CGMEOLEIt, Dual)
- TRY_DUAL(IID_IGMEOLEIt)
+ TRY_DUAL(__uuidof(IGMEOLEIt))
{
LPDISPATCH lpDisp = pThis->CreateInChildFCO( child_as_parent, (LPCTSTR) part, (LPCTSTR) name);
- lpDisp->QueryInterface(IID_IMgaFCO, (LPVOID*) new_fco);
+ lpDisp->QueryInterface(__uuidof(IMgaFCO), (LPVOID*) new_fco);
return NOERROR;
}
CATCH_ALL_DUAL
@@ -3282,10 +3282,10 @@
{
METHOD_PROLOGUE(CGMEOLEIt, Dual)
- TRY_DUAL(IID_IGMEOLEIt)
+ TRY_DUAL(__uuidof(IGMEOLEIt))
{
LPDISPATCH lpDisp = pThis->Duplicate( (LPCTSTR)existing_fco_name, (LPCTSTR)new_fco_name);
- lpDisp->QueryInterface(IID_IMgaFCO, (LPVOID*) new_fco);
+ lpDisp->QueryInterface(__uuidof(IMgaFCO), (LPVOID*) new_fco);
return NOERROR;
}
CATCH_ALL_DUAL
@@ -3295,10 +3295,10 @@
{
METHOD_PROLOGUE(CGMEOLEIt, Dual)
- TRY_DUAL(IID_IGMEOLEIt)
+ TRY_DUAL(__uuidof(IGMEOLEIt))
{
LPDISPATCH lpDisp = pThis->DuplicateFCO( existing_fco, (LPCTSTR)new_fco_name);
- lpDisp->QueryInterface(IID_IMgaFCO, (LPVOID*) new_fco);
+ lpDisp->QueryInterface(__uuidof(IMgaFCO), (LPVOID*) new_fco);
return NOERROR;
}
CATCH_ALL_DUAL
@@ -3308,7 +3308,7 @@
{
METHOD_PROLOGUE(CGMEOLEIt, Dual)
- TRY_DUAL(IID_IGMEOLEIt)
+ TRY_DUAL(__uuidof(IGMEOLEIt))
{
pThis->Rename( (LPCTSTR)oldname, (LPCTSTR)newname);
}
@@ -3319,7 +3319,7 @@
{
METHOD_PROLOGUE(CGMEOLEIt, Dual)
- TRY_DUAL(IID_IGMEOLEIt)
+ TRY_DUAL(__uuidof(IGMEOLEIt))
{
pThis->SetName( fco, (LPCTSTR)name);
}
@@ -3330,7 +3330,7 @@
{
METHOD_PROLOGUE(CGMEOLEIt, Dual)
- TRY_DUAL(IID_IGMEOLEIt)
+ TRY_DUAL(__uuidof(IGMEOLEIt))
{
pThis->Include( (LPCTSTR) setname, (LPCTSTR) fconame );
}
@@ -3341,7 +3341,7 @@
{
METHOD_PROLOGUE(CGMEOLEIt, Dual)
- TRY_DUAL(IID_IGMEOLEIt)
+ TRY_DUAL(__uuidof(IGMEOLEIt))
{
pThis->IncludeFCO( set, fco );
}
@@ -3352,7 +3352,7 @@
{
METHOD_PROLOGUE(CGMEOLEIt, Dual)
- TRY_DUAL(IID_IGMEOLEIt)
+ TRY_DUAL(__uuidof(IGMEOLEIt))
{
pThis->Exclude( (LPCTSTR) setname, (LPCTSTR) fconame );
}
@@ -3363,7 +3363,7 @@
{
METHOD_PROLOGUE(CGMEOLEIt, Dual)
- TRY_DUAL(IID_IGMEOLEIt)
+ TRY_DUAL(__uuidof(IGMEOLEIt))
{
pThis->ExcludeFCO( set, fco );
}
@@ -3374,10 +3374,10 @@
{
METHOD_PROLOGUE(CGMEOLEIt, Dual)
- TRY_DUAL(IID_IGMEOLEIt)
+ TRY_DUAL(__uuidof(IGMEOLEIt))
{
LPDISPATCH lpDisp = pThis->Connect( (LPCTSTR) name1, (LPCTSTR) name2, (LPCTSTR) connection );
- lpDisp->QueryInterface(IID_IMgaConnection, (LPVOID*) conn);
+ lpDisp->QueryInterface(__uuidof(IMgaConnection), (LPVOID*) conn);
}
CATCH_ALL_DUAL
@@ -3387,7 +3387,7 @@
{
METHOD_PROLOGUE(CGMEOLEIt, Dual)
- TRY_DUAL(IID_IGMEOLEIt)
+ TRY_DUAL(__uuidof(IGMEOLEIt))
{
pThis->Disconnect( (LPCTSTR) part1, (LPCTSTR) part2, (LPCTSTR) connection );
}
@@ -3398,10 +3398,10 @@
{
METHOD_PROLOGUE(CGMEOLEIt, Dual)
- TRY_DUAL(IID_IGMEOLEIt)
+ TRY_DUAL(__uuidof(IGMEOLEIt))
{
LPDISPATCH lpDisp = pThis->ConnectThruPort( (LPCTSTR) part1, (LPCTSTR) port1, (LPCTSTR) part2, (LPCTSTR) port2, (LPCTSTR) connection);
- lpDisp->QueryInterface(IID_IMgaConnection, (LPVOID*) conn);
+ lpDisp->QueryInterface(__uuidof(IMgaConnection), (LPVOID*) conn);
}
CATCH_ALL_DUAL
}
@@ -3410,10 +3410,10 @@
{
METHOD_PROLOGUE(CGMEOLEIt, Dual)
- TRY_DUAL(IID_IGMEOLEIt)
+ TRY_DUAL(__uuidof(IGMEOLEIt))
{
LPDISPATCH lpDisp = pThis->ConnectThruPortFCO( src_part, src_ref, dst_part, dst_ref, (LPCTSTR) connection_role);
- lpDisp->QueryInterface(IID_IMgaConnection, (LPVOID*) conn);
+ lpDisp->QueryInterface(__uuidof(IMgaConnection), (LPVOID*) conn);
}
CATCH_ALL_DUAL
}
@@ -3422,7 +3422,7 @@
{
METHOD_PROLOGUE(CGMEOLEIt, Dual)
- TRY_DUAL(IID_IGMEOLEIt)
+ TRY_DUAL(__uuidof(IGMEOLEIt))
{
pThis->DisconnectThruPort( (LPCTSTR) part1, (LPCTSTR) port1, (LPCTSTR) part2, (LPCTSTR) port2, (LPCTSTR) connection );
}
@@ -3433,10 +3433,10 @@
{
METHOD_PROLOGUE(CGMEOLEIt, Dual)
- TRY_DUAL(IID_IGMEOLEIt)
+ TRY_DUAL(__uuidof(IGMEOLEIt))
{
LPDISPATCH lpDisp = pThis->ConnectFCOs( part1, part2, (LPCTSTR) connection );
- lpDisp->QueryInterface(IID_IMgaConnection, (LPVOID*) conn);
+ lpDisp->QueryInterface(__uuidof(IMgaConnection), (LPVOID*) conn);
}
CATCH_ALL_DUAL
}
@@ -3445,7 +3445,7 @@
{
METHOD_PROLOGUE(CGMEOLEIt, Dual)
- TRY_DUAL(IID_IGMEOLEIt)
+ TRY_DUAL(__uuidof(IGMEOLEIt))
{
pThis->DisconnectFCOs( part1, part2, (LPCTSTR) connection );
}
@@ -3456,7 +3456,7 @@
{
METHOD_PROLOGUE(CGMEOLEIt, Dual)
- TRY_DUAL(IID_IGMEOLEIt)
+ TRY_DUAL(__uuidof(IGMEOLEIt))
{
pThis->Refer( (LPCTSTR) reference, (LPCTSTR) referred );
}
@@ -3467,7 +3467,7 @@
{
METHOD_PROLOGUE(CGMEOLEIt, Dual)
- TRY_DUAL(IID_IGMEOLEIt)
+ TRY_DUAL(__uuidof(IGMEOLEIt))
{
pThis->ReferFCO( reference, referred );
}
@@ -3478,7 +3478,7 @@
{
METHOD_PROLOGUE(CGMEOLEIt, Dual)
- TRY_DUAL(IID_IGMEOLEIt)
+ TRY_DUAL(__uuidof(IGMEOLEIt))
{
pThis->ClearRef( (LPCTSTR) reference);
}
@@ -3489,7 +3489,7 @@
{
METHOD_PROLOGUE(CGMEOLEIt, Dual)
- TRY_DUAL(IID_IGMEOLEIt)
+ TRY_DUAL(__uuidof(IGMEOLEIt))
{
pThis->ClearRefFCO( reference);
}
@@ -3500,7 +3500,7 @@
{
METHOD_PROLOGUE(CGMEOLEIt, Dual)
- TRY_DUAL(IID_IGMEOLEIt)
+ TRY_DUAL(__uuidof(IGMEOLEIt))
{
pThis->FollowRef( (LPCTSTR) reference);
}
@@ -3511,7 +3511,7 @@
{
METHOD_PROLOGUE(CGMEOLEIt, Dual)
- TRY_DUAL(IID_IGMEOLEIt)
+ TRY_DUAL(__uuidof(IGMEOLEIt))
{
pThis->FollowRefFCO( reference);
}
@@ -3522,10 +3522,10 @@
{
METHOD_PROLOGUE(CGMEOLEIt, Dual)
- TRY_DUAL(IID_IGMEOLEIt)
+ TRY_DUAL(__uuidof(IGMEOLEIt))
{
LPDISPATCH lpDisp = pThis->NullFCO();
- lpDisp->QueryInterface(IID_IMgaFCO, (LPVOID*) nullobj);
+ lpDisp->QueryInterface(__uuidof(IMgaFCO), (LPVOID*) nullobj);
}
CATCH_ALL_DUAL
}
@@ -3534,7 +3534,7 @@
{
METHOD_PROLOGUE(CGMEOLEIt, Dual)
- TRY_DUAL(IID_IGMEOLEIt)
+ TRY_DUAL(__uuidof(IGMEOLEIt))
{
pThis->SetAttribute( (LPCTSTR) name, (LPCTSTR) attr_name, value );
}
@@ -3545,7 +3545,7 @@
{
METHOD_PROLOGUE(CGMEOLEIt, Dual)
- TRY_DUAL(IID_IGMEOLEIt)
+ TRY_DUAL(__uuidof(IGMEOLEIt))
{
CComVariant p = pThis->GetAttribute( (LPCTSTR) name, (LPCTSTR) attr_name );
*value = p;
@@ -3557,7 +3557,7 @@
{
METHOD_PROLOGUE(CGMEOLEIt, Dual)
- TRY_DUAL(IID_IGMEOLEIt)
+ TRY_DUAL(__uuidof(IGMEOLEIt))
{
pThis->SetAttributeFCO( fco, (LPCTSTR) attr_name, value);
}
@@ -3568,7 +3568,7 @@
{
METHOD_PROLOGUE(CGMEOLEIt, Dual)
- TRY_DUAL(IID_IGMEOLEIt)
+ TRY_DUAL(__uuidof(IGMEOLEIt))
{
CComVariant p = pThis->GetAttributeFCO( fco, (LPCTSTR) attr_name );
*value = p;
@@ -3580,10 +3580,10 @@
{
METHOD_PROLOGUE(CGMEOLEIt, Dual)
- TRY_DUAL(IID_IGMEOLEIt)
+ TRY_DUAL(__uuidof(IGMEOLEIt))
{
LPDISPATCH lpDisp = pThis->SubType( (LPCTSTR) base, (LPCTSTR) name_of_subtype);
- lpDisp->QueryInterface(IID_IMgaFCO, (LPVOID*) subtype);
+ lpDisp->QueryInterface(__uuidof(IMgaFCO), (LPVOID*) subtype);
}
CATCH_ALL_DUAL
}
@@ -3592,10 +3592,10 @@
{
METHOD_PROLOGUE(CGMEOLEIt, Dual)
- TRY_DUAL(IID_IGMEOLEIt)
+ TRY_DUAL(__uuidof(IGMEOLEIt))
{
LPDISPATCH lpDisp = pThis->Instantiate( (LPCTSTR) base, (LPCTSTR) name_of_instance);
- lpDisp->QueryInterface(IID_IMgaFCO, (LPVOID*) instance);
+ lpDisp->QueryInterface(__uuidof(IMgaFCO), (LPVOID*) instance);
}
CATCH_ALL_DUAL
}
@@ -3604,10 +3604,10 @@
{
METHOD_PROLOGUE(CGMEOLEIt, Dual)
- TRY_DUAL(IID_IGMEOLEIt)
+ TRY_DUAL(__uuidof(IGMEOLEIt))
{
LPDISPATCH lpDisp = pThis->SubTypeFCO( base_ptr, (LPCTSTR) name_of_subtype);
- lpDisp->QueryInterface(IID_IMgaFCO, (LPVOID*) subtype);
+ lpDisp->QueryInterface(__uuidof(IMgaFCO), (LPVOID*) subtype);
}
CATCH_ALL_DUAL
}
@@ -3616,10 +3616,10 @@
{
METHOD_PROLOGUE(CGMEOLEIt, Dual)
- TRY_DUAL(IID_IGMEOLEIt)
+ TRY_DUAL(__uuidof(IGMEOLEIt))
{
LPDISPATCH lpDisp = pThis->InstantiateFCO( base_ptr, (LPCTSTR) name_of_instance);
- lpDisp->QueryInterface(IID_IMgaFCO, (LPVOID*) instance);
+ lpDisp->QueryInterface(__uuidof(IMgaFCO), (LPVOID*) instance);
}
CATCH_ALL_DUAL
}
@@ -3628,7 +3628,7 @@
{
METHOD_PROLOGUE(CGMEOLEIt, Dual)
- TRY_DUAL(IID_IGMEOLEIt)
+ TRY_DUAL(__uuidof(IGMEOLEIt))
{
pThis->BeginTransaction();
}
@@ -3639,7 +3639,7 @@
{
METHOD_PROLOGUE(CGMEOLEIt, Dual)
- TRY_DUAL(IID_IGMEOLEIt)
+ TRY_DUAL(__uuidof(IGMEOLEIt))
{
pThis->CommitTransaction();
}
@@ -3650,7 +3650,7 @@
{
METHOD_PROLOGUE(CGMEOLEIt, Dual)
- TRY_DUAL(IID_IGMEOLEIt)
+ TRY_DUAL(__uuidof(IGMEOLEIt))
{
pThis->AbortTransaction();
}
@@ -3661,7 +3661,7 @@
{
METHOD_PROLOGUE(CGMEOLEIt, Dual)
- TRY_DUAL(IID_IGMEOLEIt)
+ TRY_DUAL(__uuidof(IGMEOLEIt))
{
*intrans = pThis->IsInTransaction();
}
@@ -3672,10 +3672,10 @@
{
METHOD_PROLOGUE(CGMEOLEIt, Dual)
- TRY_DUAL(IID_IGMEOLEIt)
+ TRY_DUAL(__uuidof(IGMEOLEIt))
{
LPDISPATCH lpDisp = pThis->PutInTerritory( fco);
- lpDisp->QueryInterface(IID_IMgaFCO, (LPVOID*) newfco);
+ lpDisp->QueryInterface(__uuidof(IMgaFCO), (LPVOID*) newfco);
return NOERROR;
}
CATCH_ALL_DUAL
@@ -3685,7 +3685,7 @@
{
METHOD_PROLOGUE(CGMEOLEIt, Dual)
- TRY_DUAL(IID_IGMEOLEIt)
+ TRY_DUAL(__uuidof(IGMEOLEIt))
{
pThis->Help();
return NOERROR;
@@ -3697,7 +3697,7 @@
{
METHOD_PROLOGUE(CGMEOLEIt, Dual)
- TRY_DUAL(IID_IGMEOLEIt)
+ TRY_DUAL(__uuidof(IGMEOLEIt))
{
pThis->SetSelected( (LPCTSTR) space_delimited_string);
return NOERROR;
@@ -3709,7 +3709,7 @@
{
METHOD_PROLOGUE(CGMEOLEIt, Dual)
- TRY_DUAL(IID_IGMEOLEIt)
+ TRY_DUAL(__uuidof(IGMEOLEIt))
{
CComBSTR p = pThis->GetSelected();
*space_delimited_string = p.Detach();
@@ -3722,7 +3722,7 @@
{
METHOD_PROLOGUE(CGMEOLEIt, Dual)
- TRY_DUAL(IID_IGMEOLEIt)
+ TRY_DUAL(__uuidof(IGMEOLEIt))
{
TRACE( _T("XDual::SetSelectedFCOs"));
pThis->SetSelectedFCOs( fcos_to_select);
@@ -3735,11 +3735,11 @@
{
METHOD_PROLOGUE(CGMEOLEIt, Dual)
- TRY_DUAL(IID_IGMEOLEIt)
+ TRY_DUAL(__uuidof(IGMEOLEIt))
{
TRACE( _T("XDual::GetSelectedFCOs"));
LPDISPATCH lpDisp = pThis->GetSelectedFCOs();
- lpDisp->QueryInterface(IID_IMgaFCOs, (LPVOID*)selected_fcos);
+ lpDisp->QueryInterface(__uuidof(IMgaFCOs), (LPVOID*)selected_fcos);
return NOERROR;
}
@@ -3750,7 +3750,7 @@
{
METHOD_PROLOGUE(CGMEOLEIt, Dual)
- TRY_DUAL(IID_IGMEOLEIt)
+ TRY_DUAL(__uuidof(IGMEOLEIt))
{
CComBSTR string_asp = pThis->GetCurrentAspect();
*aspectName = string_asp.Detach();
@@ -3763,7 +3763,7 @@
{
METHOD_PROLOGUE(CGMEOLEIt, Dual)
- TRY_DUAL(IID_IGMEOLEIt)
+ TRY_DUAL(__uuidof(IGMEOLEIt))
{
pThis->SetCurrentAspect(CString(aspectName));
return S_OK;
@@ -3775,7 +3775,7 @@
{
METHOD_PROLOGUE(CGMEOLEIt, Dual)
- TRY_DUAL(IID_IGMEOLEIt)
+ TRY_DUAL(__uuidof(IGMEOLEIt))
{
pThis->NextAspect();
return NOERROR;
@@ -3787,7 +3787,7 @@
{
METHOD_PROLOGUE(CGMEOLEIt, Dual)
- TRY_DUAL(IID_IGMEOLEIt)
+ TRY_DUAL(__uuidof(IGMEOLEIt))
{
pThis->PrevAspect();
return NOERROR;
@@ -3799,7 +3799,7 @@
{
METHOD_PROLOGUE(CGMEOLEIt, Dual)
- TRY_DUAL(IID_IGMEOLEIt)
+ TRY_DUAL(__uuidof(IGMEOLEIt))
{
pThis->Next();
return NOERROR;
@@ -3811,7 +3811,7 @@
{
METHOD_PROLOGUE(CGMEOLEIt, Dual)
- TRY_DUAL(IID_IGMEOLEIt)
+ TRY_DUAL(__uuidof(IGMEOLEIt))
{
pThis->Prev();
return NOERROR;
@@ -3823,7 +3823,7 @@
{
METHOD_PROLOGUE(CGMEOLEIt, Dual)
- TRY_DUAL(IID_IGMEOLEIt)
+ TRY_DUAL(__uuidof(IGMEOLEIt))
{
pThis->Position( (LPCTSTR) pChildName, (LPCTSTR) pAspectName, parX, parY);
return NOERROR;
@@ -3835,7 +3835,7 @@
{
METHOD_PROLOGUE(CGMEOLEIt, Dual)
- TRY_DUAL(IID_IGMEOLEIt)
+ TRY_DUAL(__uuidof(IGMEOLEIt))
{
pThis->PositionFCO( pChildPtr, (LPCTSTR) pAspectName, parX, parY);
return NOERROR;
Modified: trunk/GME/Gme/GMEOLEModel.cpp
==============================================================================
--- trunk/GME/Gme/GMEOLEModel.cpp Wed Aug 31 18:21:55 2011 (r1486)
+++ trunk/GME/Gme/GMEOLEModel.cpp Wed Aug 31 20:01:28 2011 (r1487)
@@ -102,7 +102,7 @@
BEGIN_INTERFACE_MAP(CGMEOLEModel, CCmdTarget)
- INTERFACE_PART(CGMEOLEModel, IID_IGMEOLEModel, Dual)
+ INTERFACE_PART(CGMEOLEModel, __uuidof(IGMEOLEModel), Dual)
DUAL_ERRORINFO_PART(CGMEOLEModel)
END_INTERFACE_MAP()
@@ -519,14 +519,14 @@
// Implement ISupportErrorInfo to indicate we support the
// OLE Automation error handler.
-IMPLEMENT_DUAL_ERRORINFO(CGMEOLEModel, IID_IGMEOLEModel)
+IMPLEMENT_DUAL_ERRORINFO(CGMEOLEModel, __uuidof(IGMEOLEModel))
STDMETHODIMP CGMEOLEModel::XDual::put_Active(VARIANT_BOOL isActive)
{
METHOD_PROLOGUE(CGMEOLEModel, Dual)
- TRY_DUAL(IID_IGMEOLEModel)
+ TRY_DUAL(__uuidof(IGMEOLEModel))
{
pThis->SetActive(isActive);
return NOERROR;
@@ -538,7 +538,7 @@
{
METHOD_PROLOGUE(CGMEOLEModel, Dual)
- TRY_DUAL(IID_IGMEOLEModel)
+ TRY_DUAL(__uuidof(IGMEOLEModel))
{
#pragma warning(disable: 4310) // cast truncates constant value
*isActive = (pThis->GetActive() == FALSE) ? VARIANT_FALSE : VARIANT_TRUE;
@@ -552,10 +552,10 @@
{
METHOD_PROLOGUE(CGMEOLEModel, Dual)
- TRY_DUAL(IID_IGMEOLEModel)
+ TRY_DUAL(__uuidof(IGMEOLEModel))
{
LPDISPATCH lpDisp = pThis->GetAspects();
- lpDisp->QueryInterface(IID_IGMEOLEColl, (LPVOID*)coll);
+ lpDisp->QueryInterface(__uuidof(IGMEOLEColl), (LPVOID*)coll);
return NOERROR;
}
CATCH_ALL_DUAL
@@ -565,10 +565,10 @@
{
METHOD_PROLOGUE(CGMEOLEModel, Dual)
- TRY_DUAL(IID_IGMEOLEModel)
+ TRY_DUAL(__uuidof(IGMEOLEModel))
{
LPDISPATCH lpDisp = pThis->GetMgaModel();
- lpDisp->QueryInterface(IID_IMgaModel, (LPVOID*)model);
+ lpDisp->QueryInterface(__uuidof(IMgaModel), (LPVOID*)model);
return NOERROR;
}
CATCH_ALL_DUAL
@@ -578,7 +578,7 @@
{
METHOD_PROLOGUE(CGMEOLEModel, Dual)
- TRY_DUAL(IID_IGMEOLEModel)
+ TRY_DUAL(__uuidof(IGMEOLEModel))
{
#pragma warning(disable: 4310) // cast truncates constant value
*isValid = (pThis->GetValid() == FALSE) ? VARIANT_FALSE : VARIANT_TRUE;
@@ -592,7 +592,7 @@
{
METHOD_PROLOGUE(CGMEOLEModel, Dual)
- TRY_DUAL(IID_IGMEOLEModel)
+ TRY_DUAL(__uuidof(IGMEOLEModel))
{
pThis->Print();
return NOERROR;
@@ -604,7 +604,7 @@
{
METHOD_PROLOGUE(CGMEOLEModel, Dual)
- TRY_DUAL(IID_IGMEOLEModel)
+ TRY_DUAL(__uuidof(IGMEOLEModel))
{
pThis->PrintDialog();
return NOERROR;
@@ -617,7 +617,7 @@
{
METHOD_PROLOGUE(CGMEOLEModel, Dual)
- TRY_DUAL(IID_IGMEOLEModel)
+ TRY_DUAL(__uuidof(IGMEOLEModel))
{
pThis->DumpWindowsMetaFile(CString(filePath));
return NOERROR;
@@ -630,7 +630,7 @@
{
METHOD_PROLOGUE(CGMEOLEModel, Dual)
- TRY_DUAL(IID_IGMEOLEModel)
+ TRY_DUAL(__uuidof(IGMEOLEModel))
{
pThis->CheckConstraints();
return NOERROR;
@@ -643,7 +643,7 @@
{
METHOD_PROLOGUE(CGMEOLEModel, Dual)
- TRY_DUAL(IID_IGMEOLEModel)
+ TRY_DUAL(__uuidof(IGMEOLEModel))
{
pThis->RunComponent(CString(appID));
return NOERROR;
@@ -656,7 +656,7 @@
{
METHOD_PROLOGUE(CGMEOLEModel, Dual)
- TRY_DUAL(IID_IGMEOLEModel)
+ TRY_DUAL(__uuidof(IGMEOLEModel))
{
pThis->RunComponentDialog();
return NOERROR;
@@ -669,7 +669,7 @@
{
METHOD_PROLOGUE(CGMEOLEModel, Dual)
- TRY_DUAL(IID_IGMEOLEModel)
+ TRY_DUAL(__uuidof(IGMEOLEModel))
{
pThis->Close();
return NOERROR;
@@ -682,7 +682,7 @@
{
METHOD_PROLOGUE(CGMEOLEModel, Dual)
- TRY_DUAL(IID_IGMEOLEModel)
+ TRY_DUAL(__uuidof(IGMEOLEModel))
{
LPDISPATCH lpDisp = NULL;
mgaFCO->QueryInterface(IID_IDispatch, (LPVOID*)&lpDisp);
@@ -698,7 +698,7 @@
{
METHOD_PROLOGUE(CGMEOLEModel, Dual)
- TRY_DUAL(IID_IGMEOLEModel)
+ TRY_DUAL(__uuidof(IGMEOLEModel))
{
pThis->GrayOutHide();
return NOERROR;
@@ -710,7 +710,7 @@
{
METHOD_PROLOGUE(CGMEOLEModel, Dual)
- TRY_DUAL(IID_IGMEOLEModel)
+ TRY_DUAL(__uuidof(IGMEOLEModel))
{
LPDISPATCH lpDisp = NULL;
mgaFCO->QueryInterface(IID_IDispatch, (LPVOID*)&lpDisp);
@@ -726,7 +726,7 @@
{
METHOD_PROLOGUE(CGMEOLEModel, Dual)
- TRY_DUAL(IID_IGMEOLEModel)
+ TRY_DUAL(__uuidof(IGMEOLEModel))
{
pThis->HideSetMembers();
return NOERROR;
@@ -738,7 +738,7 @@
{
METHOD_PROLOGUE(CGMEOLEModel, Dual)
- TRY_DUAL(IID_IGMEOLEModel)
+ TRY_DUAL(__uuidof(IGMEOLEModel))
{
pThis->Zoom(percent);
return NOERROR;
@@ -750,7 +750,7 @@
{
METHOD_PROLOGUE(CGMEOLEModel, Dual)
- TRY_DUAL(IID_IGMEOLEModel)
+ TRY_DUAL(__uuidof(IGMEOLEModel))
{
pThis->ZoomTo(mgaFCOs);
return NOERROR;
@@ -762,7 +762,7 @@
{
METHOD_PROLOGUE(CGMEOLEModel, Dual)
- TRY_DUAL(IID_IGMEOLEModel)
+ TRY_DUAL(__uuidof(IGMEOLEModel))
{
pThis->Scroll(bar, scroll);
return NOERROR;
@@ -775,7 +775,7 @@
{
METHOD_PROLOGUE(CGMEOLEModel, Dual)
- TRY_DUAL(IID_IGMEOLEModel)
+ TRY_DUAL(__uuidof(IGMEOLEModel))
{
return pThis->DumpModelGeometryXML(CString(filePath));
}
@@ -786,7 +786,7 @@
{
METHOD_PROLOGUE(CGMEOLEModel, Dual)
- TRY_DUAL(IID_IGMEOLEModel)
+ TRY_DUAL(__uuidof(IGMEOLEModel))
{
CComBSTR string_asp = pThis->GetCurrentAspect();
*aspectName = string_asp.Detach();
@@ -799,7 +799,7 @@
{
METHOD_PROLOGUE(CGMEOLEModel, Dual)
- TRY_DUAL(IID_IGMEOLEModel)
+ TRY_DUAL(__uuidof(IGMEOLEModel))
{
pThis->SetCurrentAspect(CString(aspectName));
return S_OK;
Modified: trunk/GME/Gme/GMEOLEPanel.cpp
==============================================================================
--- trunk/GME/Gme/GMEOLEPanel.cpp Wed Aug 31 18:21:55 2011 (r1486)
+++ trunk/GME/Gme/GMEOLEPanel.cpp Wed Aug 31 20:01:28 2011 (r1487)
@@ -66,7 +66,7 @@
BEGIN_INTERFACE_MAP(CGMEOLEPanel, CCmdTarget)
- INTERFACE_PART(CGMEOLEPanel, IID_IGMEOLEPanel, Dual)
+ INTERFACE_PART(CGMEOLEPanel, __uuidof(IGMEOLEPanel), Dual)
DUAL_ERRORINFO_PART(CGMEOLEPanel)
END_INTERFACE_MAP()
@@ -133,14 +133,14 @@
// Implement ISupportErrorInfo to indicate we support the
// OLE Automation error handler.
-IMPLEMENT_DUAL_ERRORINFO(CGMEOLEPanel, IID_IGMEOLEAspect)
+IMPLEMENT_DUAL_ERRORINFO(CGMEOLEPanel, __uuidof(IGMEOLEPanel))
STDMETHODIMP CGMEOLEPanel::XDual::get_Name(BSTR* name)
{
METHOD_PROLOGUE(CGMEOLEPanel, Dual)
- TRY_DUAL(IID_IGMEOLEPanel)
+ TRY_DUAL(__uuidof(IGMEOLEPanel))
{
CString str = pThis->GetName();
str.SetSysString(name);
@@ -154,7 +154,7 @@
{
METHOD_PROLOGUE(CGMEOLEPanel, Dual)
- TRY_DUAL(IID_IGMEOLEPanel)
+ TRY_DUAL(__uuidof(IGMEOLEPanel))
{
pThis->SetVisible(isVisible);
return NOERROR;
@@ -167,7 +167,7 @@
{
METHOD_PROLOGUE(CGMEOLEPanel, Dual)
- TRY_DUAL(IID_IGMEOLEPanel)
+ TRY_DUAL(__uuidof(IGMEOLEPanel))
{
*isVisible = (pThis->GetVisible() == FALSE) ? VARIANT_FALSE : VARIANT_TRUE;
return NOERROR;
@@ -179,7 +179,7 @@
{
METHOD_PROLOGUE(CGMEOLEPanel, Dual)
- TRY_DUAL(IID_IGMEOLEPanel)
+ TRY_DUAL(__uuidof(IGMEOLEPanel))
{
*interf = pThis->GetInterface();
return NOERROR;
Modified: trunk/GME/Gme/GMEView.cpp
==============================================================================
--- trunk/GME/Gme/GMEView.cpp Wed Aug 31 18:21:55 2011 (r1486)
+++ trunk/GME/Gme/GMEView.cpp Wed Aug 31 20:01:28 2011 (r1487)
@@ -997,7 +997,7 @@
CComPtr<IMgaFCO> centerObj;
try {
- COMTHROW(theApp.mgaProject->CreateTerritory(driver,&terry));
+ COMTHROW(theApp.mgaProject->CreateTerritory(driver,&terry, NULL));
BeginTransaction(TRANSACTION_READ_ONLY);
{
@@ -1007,7 +1007,7 @@
COMTHROW(ob->QueryInterface(¤tModel));
}
- COMTHROW(currentModel->Open());
+ COMTHROW(currentModel->Open(OPEN_READ));
COMTHROW(currentModel->get_Name(PutOut(name)));
CComPtr<IMgaMetaFCO> meta;
COMTHROW(currentModel->get_Meta(&meta));
@@ -2335,7 +2335,7 @@
CComPtr<IMgaObject> spObject = currentModel.p;
while ( true ) {
CComPtr<IMgaObject> spParent;
- if ( SUCCEEDED( spObject->GetParent( &spParent ) ) && spParent ) {;
+ if ( SUCCEEDED( spObject->GetParent( &spParent, NULL ) ) && spParent ) {;
CComBSTR bstrName;
COMTHROW( spParent->get_Name( &bstrName ) );
path = CString( bstrName ) + _T("/") + path;
@@ -5405,7 +5405,7 @@
COMTHROW(ref->get_Referred(&referred));
if(referred)
{
- COMTHROW(referred->GetParent(&obj));
+ COMTHROW(referred->GetParent(&obj, NULL));
COMTHROW(referred->get_ID( &referred_id));
}
CommitTransaction();
@@ -10108,7 +10108,7 @@
else
{
CComPtr<IMgaObject> parent;
- COMTHROW( next_fco->GetParent( &parent));
+ COMTHROW( next_fco->GetParent( &parent, NULL));
if( parent)
{
Modified: trunk/GME/Gme/GMEView.h
==============================================================================
--- trunk/GME/Gme/GMEView.h Wed Aug 31 18:21:55 2011 (r1486)
+++ trunk/GME/Gme/GMEView.h Wed Aug 31 20:01:28 2011 (r1487)
@@ -651,7 +651,7 @@
class ATL_NO_VTABLE CViewDriver :
public CComObjectRootEx<CComSingleThreadModel>,
- public IDispatchImpl<IMgaEventSink, &IID_IMgaEventSink, &LIBID_MGALib>
+ public IDispatchImpl<IMgaEventSink, &__uuidof(IMgaEventSink), &__uuidof(__MGALib)>
{
public:
CViewDriver() { }
Modified: trunk/GME/Gme/GUIObject.cpp
==============================================================================
--- trunk/GME/Gme/GUIObject.cpp Wed Aug 31 18:21:55 2011 (r1486)
+++ trunk/GME/Gme/GUIObject.cpp Wed Aug 31 20:01:28 2011 (r1487)
@@ -2837,7 +2837,7 @@
else if (tp == ATTVAL_REFERENCE) {
aval = _T("Reference attr. label not supported"); // Sorry, maybe later
}
- else if (tp == ATTVAL_ENUM) {
+ else if (tp == _attval_enum) {
VERIFY(attrValue.vt == VT_BSTR);
CString attrValueStr(attrValue.bstrVal);
/* CGuiMenuCtrl *guiMenuCtrl = dynamic_cast<CGuiMenuCtrl *>(guiMetaAttr->depCtrl);
Modified: trunk/GME/Gme/GuiMeta.cpp
==============================================================================
--- trunk/GME/Gme/GuiMeta.cpp Wed Aug 31 18:21:55 2011 (r1486)
+++ trunk/GME/Gme/GuiMeta.cpp Wed Aug 31 20:01:28 2011 (r1487)
@@ -330,7 +330,7 @@
case ATTVAL_BOOLEAN:
mAttr = new CGuiMetaToggleAttribute(mmAttr,this);
break;
- case ATTVAL_ENUM:
+ case _attval_enum:
mAttr = new CGuiMetaMenuAttribute(mmAttr,this);
break;
case ATTVAL_REFERENCE:
Modified: trunk/GME/Gme/ModelPropertiesDlgBar.cpp
==============================================================================
--- trunk/GME/Gme/ModelPropertiesDlgBar.cpp Wed Aug 31 18:21:55 2011 (r1486)
+++ trunk/GME/Gme/ModelPropertiesDlgBar.cpp Wed Aug 31 20:01:28 2011 (r1487)
@@ -27,6 +27,7 @@
void CModelPropertiesDlgBar::ShowType()
{
+ // FIXME: fix for DPI
GetDlgItem(IDC_TYPEMARK)->MoveWindow(6,8,16,16);
GetDlgItem(IDC_TYPEMARK)->ShowWindow(SW_SHOW);
GetDlgItem(IDC_INSTANCEMARK)->ShowWindow(SW_HIDE);
@@ -35,6 +36,7 @@
void CModelPropertiesDlgBar::ShowInstance()
{
+ // FIXME: fix for DPI
GetDlgItem(IDC_TYPEMARK)->ShowWindow(SW_HIDE);
GetDlgItem(IDC_INSTANCEMARK)->MoveWindow(6,8,16,16);
GetDlgItem(IDC_INSTANCEMARK)->ShowWindow(SW_SHOW);
Modified: trunk/GME/Gme/ParadigmPropertiesDlg.cpp
==============================================================================
--- trunk/GME/Gme/ParadigmPropertiesDlg.cpp Wed Aug 31 18:21:55 2011 (r1486)
+++ trunk/GME/Gme/ParadigmPropertiesDlg.cpp Wed Aug 31 20:01:28 2011 (r1487)
@@ -53,7 +53,7 @@
CDialog::OnInitDialog();
CComObjPtr<IMgaTerritory> terry;
- COMTHROW( theApp.mgaProject->CreateTerritory(NULL, PutOut(terry)) );
+ COMTHROW( theApp.mgaProject->CreateTerritory(NULL, PutOut(terry), NULL) );
try {
theApp.mgaProject->BeginTransaction(terry,TRANSACTION_READ_ONLY);
CComPtr<IMgaMetaProject> metaProject;
Modified: trunk/GME/Gme/ProjectPropertiesDlg.cpp
==============================================================================
--- trunk/GME/Gme/ProjectPropertiesDlg.cpp Wed Aug 31 18:21:55 2011 (r1486)
+++ trunk/GME/Gme/ProjectPropertiesDlg.cpp Wed Aug 31 20:01:28 2011 (r1487)
@@ -56,7 +56,7 @@
void CProjectPropertiesDlg::OnOK()
{
CComObjPtr<IMgaTerritory> terry;
- COMTHROW( theApp.mgaProject->CreateTerritory(NULL, PutOut(terry)) );
+ COMTHROW( theApp.mgaProject->CreateTerritory(NULL, PutOut(terry), NULL) );
try {
COMTHROW(theApp.mgaProject->BeginTransaction(terry,TRANSACTION_GENERAL));
{
@@ -106,7 +106,7 @@
CDialog::OnInitDialog();
CComObjPtr<IMgaTerritory> terry;
- COMTHROW( theApp.mgaProject->CreateTerritory(NULL, PutOut(terry)) );
+ COMTHROW( theApp.mgaProject->CreateTerritory(NULL, PutOut(terry), NULL) );
try {
theApp.mgaProject->BeginTransaction(terry,TRANSACTION_READ_ONLY);
{
Modified: trunk/GME/Gme/StdAfx.h
==============================================================================
--- trunk/GME/Gme/StdAfx.h Wed Aug 31 18:21:55 2011 (r1486)
+++ trunk/GME/Gme/StdAfx.h Wed Aug 31 20:01:28 2011 (r1487)
@@ -49,7 +49,32 @@
#include <atlcom.h>
-#include "MgaLib.h"
+// Imports
+#import "CoreLib.tlb" no_implementation auto_search no_namespace no_search_namespace raw_method_prefix("") high_method_prefix("__")
+#import "MetaLib.tlb" no_implementation auto_search no_namespace no_search_namespace raw_method_prefix("") high_method_prefix("__")
+#import "MgaLib.tlb" no_implementation auto_search no_namespace no_search_namespace raw_method_prefix("") high_method_prefix("__")
+#import "ParserLib.tlb" no_implementation auto_search no_namespace no_search_namespace raw_method_prefix("") high_method_prefix("__")
+#import "GMELib.tlb" no_implementation auto_search no_namespace no_search_namespace raw_method_prefix("") high_method_prefix("__")
+#import "MgaUtilLib.tlb" no_implementation auto_search no_namespace no_search_namespace raw_method_prefix("") high_method_prefix("__")
+
+#include "CommonImport.h"
+
+#define cpp_quote(x)
+#include "Interfaceversion.h"
+#undef cpp_quote
+typedef GMEInterfaceVersion_enum GMEInterfaceVersion;
+
+// Don't load the MIDL-generated headers
+#define __Core_h__
+#define __Meta_h__
+#define __Mga_h__
+#define __MgaUtil_h__
+#define __MgaUtilLib_h__
+#define __Parser_h__
+#define __Gme_h__
+#define __GmeLib_h__
+#define IID_IMgaDataSource __uuidof(IMgaDataSource)
+// End Imports
#include "CommonError.h"
#include "CommonSmart.h"
More information about the gme-commit
mailing list