[GME-commit]
GMESRC/GME/MgaUtil MgaUtil.vcproj,NONE,1.1 DirDialog.cpp,1.1,1.2
DirDialog.h,1.1,1.2 GmeDlg.cpp,1.9,1.10 GmeDlg.h,1.8,1.9
MakeClosure.cpp,1.12,1.13 MakeClosure.h,1.7,1.8
MgaRegistrar.cpp,1.40,1.41 MgaUtil.def,1.1,1.2 MgaUtil.rc,1.44,1.45
StdAfx.cpp,1.1,1.2 StdAfx.h,1.11,1.12 colorbtn.h,1.2,1.3
MgaUtil.dsp,1.27,NONE
gme-commit at list.isis.vanderbilt.edu
gme-commit at list.isis.vanderbilt.edu
Wed Jan 26 11:31:32 CST 2005
- Previous message: [GME-commit] GMESRC/GME/Gme/AutoRoute ArGraph.cpp,1.5,1.6
- Next message: [GME-commit]
GMESRC/GME/ObjectInspector ObjectInspector.vcproj,NONE,1.1
ColourPopup.cpp,1.2,1.3 ColourPopup.h,1.2,1.3
ObjectInspector.def,1.1,1.2 ObjectInspectorCtl.h,1.12,1.13
Preference.cpp,1.33,1.34 StdAfx.h,1.6,1.7
ObjectInspector.dsp,1.16,NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Update of /var/lib/gme/GMESRC/GME/MgaUtil
In directory braindrain:/tmp/cvs-serv19193/GME/MgaUtil
Modified Files:
DirDialog.cpp DirDialog.h GmeDlg.cpp GmeDlg.h MakeClosure.cpp
MakeClosure.h MgaRegistrar.cpp MgaUtil.def MgaUtil.rc
StdAfx.cpp StdAfx.h colorbtn.h
Added Files:
MgaUtil.vcproj
Removed Files:
MgaUtil.dsp
Log Message:
Checkin for VC7.1 upgrade
CVS User: zolmol
--- NEW FILE: MgaUtil.vcproj ---
<?xml version="1.0" encoding="Windows-1252"?>
<VisualStudioProject
ProjectType="Visual C++"
Version="7.10"
Name="MgaUtil"
SccProjectName=""
SccLocalPath=""
Keyword="AtlProj">
<Platforms>
<Platform
Name="Win32"/>
</Platforms>
<Configurations>
<Configuration
Name="Release|Win32"
OutputDirectory=".\Release"
IntermediateDirectory=".\Release"
ConfigurationType="2"
UseOfMFC="2"
[...1215 lines suppressed...]
<File
RelativePath="MgaRegistrar.rgs">
</File>
<File
RelativePath="MgaResolver.rgs">
</File>
<File
RelativePath="res\MgaUtil.rc2">
</File>
<File
RelativePath="MgaUtilLib.rgs">
</File>
<File
RelativePath="MgaXsltFileSel.rgs">
</File>
</Filter>
</Files>
<Globals>
</Globals>
</VisualStudioProject>
Index: DirDialog.cpp
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/MgaUtil/DirDialog.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** DirDialog.cpp 5 Jul 2000 19:21:00 -0000 1.1
--- DirDialog.cpp 26 Jan 2005 17:30:52 -0000 1.2
***************
*** 611,617 ****
CDirDialog::CDirDialog(LPCTSTR initial, LPCTSTR filter, CWnd* pParentWnd)
: CFileDialog(TRUE, NULL, NULL,
! OFN_HIDEREADONLY | OFN_OVERWRITEPROMPT | OFN_PATHMUSTEXIST,
! NULL, pParentWnd),
! m_strPath(initial)
{
// Note: m_strFilter is a member variable so it doesn't disappear because
--- 611,617 ----
CDirDialog::CDirDialog(LPCTSTR initial, LPCTSTR filter, CWnd* pParentWnd)
: CFileDialog(TRUE, NULL, NULL,
! /*OFN_ENABLEHOOK | OFN_EXPLORER |*/ OFN_HIDEREADONLY | OFN_OVERWRITEPROMPT | OFN_PATHMUSTEXIST,
! NULL, pParentWnd)
! , m_strPath(initial)
{
// Note: m_strFilter is a member variable so it doesn't disappear because
***************
*** 639,648 ****
// Create a new CDlgWnd so we can catch dialog control notifications
! VERIFY(m_DlgWnd.SubclassWindow(pp->m_hWnd));
// Create a new edit control where edt1 now is
ASSERT(pp->GetDlgItem(edt1) != NULL);
pp->GetDlgItem(edt1)->GetWindowRect(rct); //Get edt1 rectangle
! pp->ScreenToClient(rct);
VERIFY(m_Edit.Create(WS_TABSTOP | WS_VISIBLE | WS_CHILD,
--- 639,650 ----
// Create a new CDlgWnd so we can catch dialog control notifications
! ASSERT( m_DlgWnd.GetSafeHwnd() == NULL);
!
! VERIFY(m_DlgWnd.SubclassWindow(pp->m_hWnd));
// Create a new edit control where edt1 now is
ASSERT(pp->GetDlgItem(edt1) != NULL);
pp->GetDlgItem(edt1)->GetWindowRect(rct); //Get edt1 rectangle
! pp->ScreenToClient(rct); // crash
VERIFY(m_Edit.Create(WS_TABSTOP | WS_VISIBLE | WS_CHILD,
***************
*** 674,677 ****
--- 676,680 ----
pp->SendMessage(DM_SETDEFID, IDC_OPEN);
+ #define DIRDIALOG_TESTING
#ifdef DIRDIALOG_TESTING
// Move controls (rather than hide them) for testing
Index: DirDialog.h
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/MgaUtil/DirDialog.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** DirDialog.h 5 Jul 2000 19:21:00 -0000 1.1
--- DirDialog.h 26 Jan 2005 17:30:52 -0000 1.2
***************
*** 6,10 ****
#endif // _MSC_VER >= 1000
// DirDialog.h - header for CDirDialog class
!
// CDlgWnd - intercepts messages from child controls
class CDlgWnd : public CWnd
--- 6,10 ----
#endif // _MSC_VER >= 1000
// DirDialog.h - header for CDirDialog class
! #include "afxdlgs.h" //zolmol
// CDlgWnd - intercepts messages from child controls
class CDlgWnd : public CWnd
Index: GmeDlg.cpp
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/MgaUtil/GmeDlg.cpp,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** GmeDlg.cpp 2 Dec 2004 22:02:14 -0000 1.9
--- GmeDlg.cpp 26 Jan 2005 17:30:52 -0000 1.10
***************
*** 1,4 ****
--- 1,5 ----
// GmeDlg.cpp : implementation file
//
+ //#undef _NO_SCRIPT_GUIDS
#include "stdafx.h"
***************
*** 9,17 ****
//#include "basetyps.h"
//#define INITGUID
#define DEFINE_GUID(name, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8) \
const GUID name \
! = { l, w1, w2, { b1, b2, b3, b4, b5, b6, b7, b8 } }
// DEFINE_GUID(CATID_ActiveScript, 0xf0b7a1a1, 0x9847, 0x11cf, 0x8f, 0x20, 0x0, 0x80, 0x5f, 0x2c, 0xd0, 0x64);
! #include "activscp.h"
#ifdef _DEBUG
--- 10,23 ----
//#include "basetyps.h"
//#define INITGUID
+ #if(0) //z7
#define DEFINE_GUID(name, l, w1, w2, b1, b2, b3, b4, b5, b6, b7, b8) \
const GUID name \
! = { l, w1, w2, { b1, b2, b3, b4, b5, b6, b7, b8 } }
// DEFINE_GUID(CATID_ActiveScript, 0xf0b7a1a1, 0x9847, 0x11cf, 0x8f, 0x20, 0x0, 0x80, 0x5f, 0x2c, 0xd0, 0x64);
! #endif
! //DEFINE_GUID(CATID_ActiveScript, 0xf0b7a1a1, 0x9847, 0x11cf, 0x8f, 0x20, 0x0, 0x80, 0x5f, 0x2c, 0xd0, 0x64);
! const GUID CATID_ActiveScript = { 0xf0b7a1a1, 0x9847, 0x11cf, { 0x8f, 0x20, 0x0, 0x80, 0x5f, 0x2c, 0xd0, 0x64} };
! /*EXTERN_C*/ //GUID CATID_ActiveScript;
! //#include "activscp.h"
#ifdef _DEBUG
***************
*** 85,97 ****
static char exefilter[] = "Executable files (*.exe)|*.exe|All Files (*.*)|*.*||";
! void CGmeDlg::OnAddIconPath()
{
! CDirDialog dlg(NULL, icofilter, NULL);
! dlg.DoModal();
GetDlgItem(IDC_ICONPATH)->GetWindowText(m_iconpath);
- CString path = dlg.GetPath();
if( !m_iconpath.IsEmpty() && !path.IsEmpty() )
m_iconpath += ';';
--- 91,147 ----
static char exefilter[] = "Executable files (*.exe)|*.exe|All Files (*.*)|*.*||";
! //AFX_MANAGE_STATE( AfxGetStaticModuleState());
!
!
! CString CGmeDlg::getDirectory( const CString& text = "Specify the icons directory")
{
! BROWSEINFO bi;
! TCHAR szDir[MAX_PATH];
! CString Dir = "";
! LPITEMIDLIST pidl;
! LPMALLOC pMalloc;
! OleInitialize(NULL);
! if (SUCCEEDED(SHGetMalloc(&pMalloc)))
! {
! ZeroMemory(&bi,sizeof(bi));
! bi.hwndOwner = NULL;
! bi.pszDisplayName = 0;
! bi.lpszTitle = text;
! bi.pidlRoot = 0;
! bi.ulFlags = /*BIF_BROWSEINCLUDEFILES |*/ BIF_RETURNONLYFSDIRS | BIF_STATUSTEXT | BIF_EDITBOX | BIF_VALIDATE ;
! bi.lpfn = NULL;
! //Displays a dialog box that enables the user to select a shell folder
! pidl = SHBrowseForFolder(&bi) ;
! if (pidl)
! {
! // Converts an item identifier list to a file system path
! if (!SHGetPathFromIDList(pidl,szDir))
! {
! pMalloc->Free(pidl) ;
! pMalloc->Release() ;
! }
! pMalloc->Free(pidl);
! pMalloc->Release();
! }
! else
! { // Selected 'Not to save'
! return "";
! }
! Dir = szDir;
! //Dir += "\\";
! }
! // end of getting directory info
! return Dir;
! }
! void CGmeDlg::OnAddIconPath()
! {
! //CDirDialog dlg(NULL, icofilter, NULL);
! //dlg.DoModal();
! //CString path = dlg.GetPath();
! CString path = getDirectory();
GetDlgItem(IDC_ICONPATH)->GetWindowText(m_iconpath);
if( !m_iconpath.IsEmpty() && !path.IsEmpty() )
m_iconpath += ';';
***************
*** 105,115 ****
void CGmeDlg::OnAddsysiconpath()
{
! CDirDialog dlg(NULL, icofilter, NULL);
!
! dlg.DoModal();
GetDlgItem(IDC_SYSICONPATH)->GetWindowText(m_sysiconpath);
- CString path = dlg.GetPath();
if( !m_sysiconpath.IsEmpty() && !path.IsEmpty() )
m_sysiconpath += ';';
--- 155,165 ----
void CGmeDlg::OnAddsysiconpath()
{
! //CDirDialog dlg(NULL, icofilter, NULL);
! //dlg.DoModal();
! //CString path = dlg.GetPath();
! CString path = getDirectory();
GetDlgItem(IDC_SYSICONPATH)->GetWindowText(m_sysiconpath);
if( !m_sysiconpath.IsEmpty() && !path.IsEmpty() )
m_sysiconpath += ';';
***************
*** 264,268 ****
void CGmeDlg::OnOK()
{
-
CDialog::OnOK();
--- 314,317 ----
***************
*** 318,326 ****
void CGmeDlg::OnAutosaveDirButton()
{
! CDirDialog dlg(NULL, bakfilter, NULL);
! dlg.DoModal();
UpdateData(TRUE);
! m_autosave_dir = dlg.GetPath();
UpdateData(FALSE);
}
--- 367,376 ----
void CGmeDlg::OnAutosaveDirButton()
{
! //CDirDialog dlg(NULL, bakfilter, NULL);
! //dlg.DoModal();
UpdateData(TRUE);
! //m_autosave_dir = dlg.GetPath();
! m_autosave_dir = getDirectory("Select output directory for autosave");
UpdateData(FALSE);
}
Index: GmeDlg.h
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/MgaUtil/GmeDlg.h,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** GmeDlg.h 2 Dec 2004 22:02:14 -0000 1.8
--- GmeDlg.h 26 Jan 2005 17:30:52 -0000 1.9
***************
*** 65,69 ****
void AutosaveControlManager();
void ExtControlManager();
!
protected:
CComObjPtr<IMgaRegistrar> registrar;
--- 65,69 ----
void AutosaveControlManager();
void ExtControlManager();
! static CString getDirectory( const CString& text);
protected:
CComObjPtr<IMgaRegistrar> registrar;
Index: MakeClosure.cpp
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/MgaUtil/MakeClosure.cpp,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** MakeClosure.cpp 13 Oct 2004 15:17:55 -0000 1.12
--- MakeClosure.cpp 26 Jan 2005 17:30:52 -0000 1.13
***************
*** 14,17 ****
--- 14,18 ----
const std::string rootfolder_str = "RootFolder";
+
inline void nop( IMgaMetaFCO * f)
{
***************
*** 390,393 ****
--- 391,395 ----
}
+
void CMakeClosure::procSet( IMgaSet *one_set)
{
***************
*** 396,400 ****
CComObjPtrVector<IMgaFCO> members;
! COMTHROW( one_set->get_Members( PutOut( members)) );
if ( m_bSetMember)
--- 398,402 ----
CComObjPtrVector<IMgaFCO> members;
! COMTHROW( one_set->get_Members( PutOut( members)) );//zz1
if ( m_bSetMember)
***************
*** 465,469 ****
bool res = true;
CComObjPtrVector<IMgaConnPoint> v;
! COMTHROW( connection->get_ConnPoints( PutOut( v)) );
for( CComObjPtrVector<IMgaConnPoint>::iterator i = v.begin(); res && i != v.end(); ++i)
--- 467,485 ----
bool res = true;
CComObjPtrVector<IMgaConnPoint> v;
! COMTHROW( connection->get_ConnPoints( PutOut( v)) );//zz1
!
! IMgaConnection* w = 0;
! COMTHROW( w->get_ConnPoints( PutOut( v)) );//zz1
!
! IMgaSet * s = 0;
! CComObjPtrVector<IMgaFCO> members;
! COMTHROW( s->get_Members( PutOut( members)) );//zz1
!
! IMgaSet * r = 0;
! COMTHROW( r->get_Members( PutOut( members)) );//zz1
!
! CComObjPtrVector<IMgaFCO> focos;
! IMgaConnPoint * cpt = 0;
! COMTHROW( cpt->get_References( PutOut( focos)) );//zz1
for( CComObjPtrVector<IMgaConnPoint>::iterator i = v.begin(); res && i != v.end(); ++i)
***************
*** 472,476 ****
CComObjPtrVector<IMgaFCO> refs;
! COMTHROW( connpoint->get_References(PutOut( refs)) );
if( !refs.empty()) // it is a connection thru reference ports
res = false;
--- 488,492 ----
CComObjPtrVector<IMgaFCO> refs;
! COMTHROW( connpoint->get_References(PutOut( refs)) );//zz1
if( !refs.empty()) // it is a connection thru reference ports
res = false;
***************
*** 486,490 ****
CComObjPtrVector<IMgaConnPoint> v;
! COMTHROW( connection->get_ConnPoints( PutOut( v)) );
for( CComObjPtrVector<IMgaConnPoint>::iterator i = v.begin(); res && i != v.end(); ++i)
--- 502,506 ----
CComObjPtrVector<IMgaConnPoint> v;
! COMTHROW( connection->get_ConnPoints( PutOut( v)) );//zz1
for( CComObjPtrVector<IMgaConnPoint>::iterator i = v.begin(); res && i != v.end(); ++i)
***************
*** 494,498 ****
// general constraints (which apply for each case: LIB_*
CComObjPtrVector<IMgaFCO> refs;
! COMTHROW( connpoint->get_References(PutOut( refs)) );
for( CComObjPtrVector<IMgaFCO>::iterator ref_i = refs.begin(); res && ref_i != refs.end(); ++ref_i )
{
--- 510,514 ----
// general constraints (which apply for each case: LIB_*
CComObjPtrVector<IMgaFCO> refs;
! COMTHROW( connpoint->get_References(PutOut( refs)) );//zz1
for( CComObjPtrVector<IMgaFCO>::iterator ref_i = refs.begin(); res && ref_i != refs.end(); ++ref_i )
{
***************
*** 555,559 ****
{
CComObjPtrVector<IMgaConnPoint> v;
! COMTHROW( connection->get_ConnPoints( PutOut( v)) );
insertNew( CComObjPtr<IMgaFCO>( connection));
--- 571,575 ----
{
CComObjPtrVector<IMgaConnPoint> v;
! COMTHROW( connection->get_ConnPoints( PutOut( v)) );//zz1
insertNew( CComObjPtr<IMgaFCO>( connection));
***************
*** 581,585 ****
CComObjPtrVector<IMgaFCO> refs; // the reference chain the connection is drawn
! COMTHROW( connpoint->get_References( PutOut( refs)) );
if ( refs.empty()) // simple connection, no reference ports involved
--- 597,601 ----
CComObjPtrVector<IMgaFCO> refs; // the reference chain the connection is drawn
! COMTHROW( connpoint->get_References( PutOut( refs)) );//zz1
if ( refs.empty()) // simple connection, no reference ports involved
***************
*** 609,613 ****
{
CComObjPtrVector<IMgaConnPoint> my_conns;
! COMTHROW( fco->get_PartOfConns( PutOut( my_conns)) );
for( CComObjPtrVector<IMgaConnPoint>::iterator i = my_conns.begin(); i != my_conns.end(); ++i)
{
--- 625,629 ----
{
CComObjPtrVector<IMgaConnPoint> my_conns;
! COMTHROW( fco->get_PartOfConns( PutOut( my_conns)) );//zz1
for( CComObjPtrVector<IMgaConnPoint>::iterator i = my_conns.begin(); i != my_conns.end(); ++i)
{
***************
*** 626,630 ****
{
CComObjPtrVector<IMgaFCO> my_sets;
! COMTHROW( fco->get_MemberOfSets( PutOut( my_sets)) );
insertNew( my_sets);
}
--- 642,646 ----
{
CComObjPtrVector<IMgaFCO> my_sets;
! COMTHROW( fco->get_MemberOfSets( PutOut( my_sets)) );//zz1
insertNew( my_sets);
}
***************
*** 636,640 ****
{
CComObjPtrVector<IMgaFCO> my_references;
! COMTHROW( fco->get_ReferencedBy( PutOut( my_references)) );
insertNew( my_references);
}
--- 652,656 ----
{
CComObjPtrVector<IMgaFCO> my_references;
! COMTHROW( fco->get_ReferencedBy( PutOut( my_references)) );//zz1
insertNew( my_references);
}
***************
*** 820,824 ****
CComObjPtrVector<IMgaFCO> der_fcos;
! COMTHROW( fco->get_DerivedObjects( PutOut( der_fcos)) );
insertNew( der_fcos);
}
--- 836,840 ----
CComObjPtrVector<IMgaFCO> der_fcos;
! COMTHROW( fco->get_DerivedObjects( PutOut( der_fcos)) );//zz1
insertNew( der_fcos);
}
***************
*** 1351,1355 ****
std::set < std::string > actual;
CComObjPtrVector<IMgaMetaFolder> act_vec;
! f_meta->get_UsedInFolders( PutOut( act_vec) );
for( CComObjPtrVector<IMgaMetaFolder>::iterator a_i = act_vec.begin(); a_i != act_vec.end(); ++a_i)
{
--- 1367,1371 ----
std::set < std::string > actual;
CComObjPtrVector<IMgaMetaFolder> act_vec;
! f_meta->get_UsedInFolders( PutOut( act_vec) );//zz1
for( CComObjPtrVector<IMgaMetaFolder>::iterator a_i = act_vec.begin(); a_i != act_vec.end(); ++a_i)
{
***************
*** 1385,1389 ****
std::set < std::string > actual;
CComObjPtrVector<IMgaMetaFolder> act_vec;
! k_meta->get_UsedInFolders( PutOut( act_vec) );
for( CComObjPtrVector<IMgaMetaFolder>::iterator a_i = act_vec.begin(); a_i != act_vec.end(); ++a_i)
{
--- 1401,1405 ----
std::set < std::string > actual;
CComObjPtrVector<IMgaMetaFolder> act_vec;
! k_meta->get_UsedInFolders( PutOut( act_vec) );//zz1
for( CComObjPtrVector<IMgaMetaFolder>::iterator a_i = act_vec.begin(); a_i != act_vec.end(); ++a_i)
{
Index: MakeClosure.h
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/MgaUtil/MakeClosure.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** MakeClosure.h 13 Oct 2004 15:17:55 -0000 1.7
--- MakeClosure.h 26 Jan 2005 17:30:52 -0000 1.8
***************
*** 2,7 ****
#define MAKE_CLOSURE_H
- #include "CommonStl.h"
-
class GmeEqual
{
--- 2,5 ----
Index: MgaRegistrar.cpp
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/MgaUtil/MgaRegistrar.cpp,v
retrieving revision 1.40
retrieving revision 1.41
diff -C2 -d -r1.40 -r1.41
*** MgaRegistrar.cpp 2 Dec 2004 22:02:14 -0000 1.40
--- MgaRegistrar.cpp 26 Jan 2005 17:30:52 -0000 1.41
***************
*** 23,28 ****
CString buffer;
TCHAR *bufp = buffer.GetBuffer(4096);
! DWORD buflen = 4095;
! LONG err = key.QueryValue(bufp, name, &buflen);
if( err != ERROR_SUCCESS ) {
buflen = 0;
--- 23,28 ----
CString buffer;
TCHAR *bufp = buffer.GetBuffer(4096);
! ULONG buflen = 4095;
! LONG err = key.QueryStringValue( name, bufp, &buflen);
if( err != ERROR_SUCCESS ) {
buflen = 0;
***************
*** 95,104 ****
CRegKey mga;
ERRTHROW( mga.Create(HKEY_CURRENT_USER, rootreg) );
! ERRTHROW( mga.SetValue(str, "IconPath") );
}
if(mode & (RM_SYS | RM_TEST)) {
CRegKey mga;
ERRTHROW( mga.Create(HKEY_LOCAL_MACHINE, rootreg) );
! if(mode & RM_SYS) ERRTHROW( mga.SetValue(str, "IconPath") );
}
}
--- 95,104 ----
CRegKey mga;
ERRTHROW( mga.Create(HKEY_CURRENT_USER, rootreg) );
! ERRTHROW( mga.SetStringValue( "IconPath", str ));
}
if(mode & (RM_SYS | RM_TEST)) {
CRegKey mga;
ERRTHROW( mga.Create(HKEY_LOCAL_MACHINE, rootreg) );
! if(mode & RM_SYS) ERRTHROW( mga.SetStringValue( "IconPath", str));
}
}
***************
*** 144,153 ****
CRegKey mga;
ERRTHROW( mga.Create(HKEY_CURRENT_USER, rootreg) );
! ERRTHROW( mga.SetValue(str, "ShowMultipleView") );
}
if(mode & (RM_SYS | RM_TEST)) {
CRegKey mga;
ERRTHROW( mga.Create(HKEY_LOCAL_MACHINE, rootreg) );
! if(mode & RM_SYS) ERRTHROW( mga.SetValue(str, "ShowMultipleView") );
}
}
--- 144,153 ----
CRegKey mga;
ERRTHROW( mga.Create(HKEY_CURRENT_USER, rootreg) );
! ERRTHROW( mga.SetStringValue( "ShowMultipleView", str));
}
if(mode & (RM_SYS | RM_TEST)) {
CRegKey mga;
ERRTHROW( mga.Create(HKEY_LOCAL_MACHINE, rootreg) );
! if(mode & RM_SYS) ERRTHROW( mga.SetStringValue( "ShowMultipleView", str));
}
}
***************
*** 193,202 ****
CRegKey mga;
ERRTHROW( mga.Create(HKEY_CURRENT_USER, rootreg) );
! ERRTHROW( mga.SetValue(str, "EventLoggingEnabled") );
}
if(mode & (RM_SYS | RM_TEST)) {
CRegKey mga;
ERRTHROW( mga.Create(HKEY_LOCAL_MACHINE, rootreg) );
! if(mode & RM_SYS) ERRTHROW( mga.SetValue(str, "EventLoggingEnabled") );
}
}
--- 193,202 ----
CRegKey mga;
ERRTHROW( mga.Create(HKEY_CURRENT_USER, rootreg) );
! ERRTHROW( mga.SetStringValue( "EventLoggingEnabled", str));
}
if(mode & (RM_SYS | RM_TEST)) {
CRegKey mga;
ERRTHROW( mga.Create(HKEY_LOCAL_MACHINE, rootreg) );
! if(mode & RM_SYS) ERRTHROW( mga.SetStringValue( "EventLoggingEnabled", str));
}
}
***************
*** 242,251 ****
CRegKey mga;
ERRTHROW( mga.Create(HKEY_CURRENT_USER, rootreg) );
! ERRTHROW( mga.SetValue(str, "AutosaveEnabled") );
}
if(mode & (RM_SYS | RM_TEST)) {
CRegKey mga;
ERRTHROW( mga.Create(HKEY_LOCAL_MACHINE, rootreg) );
! if(mode & RM_SYS) ERRTHROW( mga.SetValue(str, "AutosaveEnabled") );
}
}
--- 242,251 ----
CRegKey mga;
ERRTHROW( mga.Create(HKEY_CURRENT_USER, rootreg) );
! ERRTHROW( mga.SetStringValue( "AutosaveEnabled", str));
}
if(mode & (RM_SYS | RM_TEST)) {
CRegKey mga;
ERRTHROW( mga.Create(HKEY_LOCAL_MACHINE, rootreg) );
! if(mode & RM_SYS) ERRTHROW( mga.SetStringValue( "AutosaveEnabled", str));
}
}
***************
*** 294,303 ****
CRegKey mga;
ERRTHROW( mga.Create(HKEY_CURRENT_USER, rootreg) );
! ERRTHROW( mga.SetValue(str, "AutosaveFreq") );
}
if(mode & (RM_SYS | RM_TEST)) {
CRegKey mga;
ERRTHROW( mga.Create(HKEY_LOCAL_MACHINE, rootreg) );
! if(mode & RM_SYS) ERRTHROW( mga.SetValue(str, "AutosaveFreq") );
}
}
--- 294,303 ----
CRegKey mga;
ERRTHROW( mga.Create(HKEY_CURRENT_USER, rootreg) );
! ERRTHROW( mga.SetStringValue( "AutosaveFreq", str));
}
if(mode & (RM_SYS | RM_TEST)) {
CRegKey mga;
ERRTHROW( mga.Create(HKEY_LOCAL_MACHINE, rootreg) );
! if(mode & RM_SYS) ERRTHROW( mga.SetStringValue( "AutosaveFreq", str));
}
}
***************
*** 343,352 ****
CRegKey mga;
ERRTHROW( mga.Create(HKEY_CURRENT_USER, rootreg) );
! ERRTHROW( mga.SetValue(str, "AutosaveUseDir") );
}
if(mode & (RM_SYS | RM_TEST)) {
CRegKey mga;
ERRTHROW( mga.Create(HKEY_LOCAL_MACHINE, rootreg) );
! if(mode & RM_SYS) ERRTHROW( mga.SetValue(str, "AutosaveUseDir") );
}
}
--- 343,352 ----
CRegKey mga;
ERRTHROW( mga.Create(HKEY_CURRENT_USER, rootreg) );
! ERRTHROW( mga.SetStringValue( "AutosaveUseDir", str));
}
if(mode & (RM_SYS | RM_TEST)) {
CRegKey mga;
ERRTHROW( mga.Create(HKEY_LOCAL_MACHINE, rootreg) );
! if(mode & RM_SYS) ERRTHROW( mga.SetStringValue( "AutosaveUseDir", str));
}
}
***************
*** 392,401 ****
CRegKey mga;
ERRTHROW( mga.Create(HKEY_CURRENT_USER, rootreg) );
! ERRTHROW( mga.SetValue(str, "AutosaveDir") );
}
if(mode & (RM_SYS | RM_TEST)) {
CRegKey mga;
ERRTHROW( mga.Create(HKEY_LOCAL_MACHINE, rootreg) );
! if(mode & RM_SYS) ERRTHROW( mga.SetValue(str, "AutosaveDir") );
}
}
--- 392,401 ----
CRegKey mga;
ERRTHROW( mga.Create(HKEY_CURRENT_USER, rootreg) );
! ERRTHROW( mga.SetStringValue( "AutosaveDir", str));
}
if(mode & (RM_SYS | RM_TEST)) {
CRegKey mga;
ERRTHROW( mga.Create(HKEY_LOCAL_MACHINE, rootreg) );
! if(mode & RM_SYS) ERRTHROW( mga.SetStringValue( "AutosaveDir", str));
}
}
***************
*** 442,451 ****
CRegKey mga;
ERRTHROW( mga.Create(HKEY_CURRENT_USER, rootreg) );
! ERRTHROW( mga.SetValue(str, "ExternalEditorEnabled") );
}
if(mode & (RM_SYS | RM_TEST)) {
CRegKey mga;
ERRTHROW( mga.Create(HKEY_LOCAL_MACHINE, rootreg) );
! if(mode & RM_SYS) ERRTHROW( mga.SetValue(str, "ExternalEditorEnabled") );
}
}
--- 442,451 ----
CRegKey mga;
ERRTHROW( mga.Create(HKEY_CURRENT_USER, rootreg) );
! ERRTHROW( mga.SetStringValue( "ExternalEditorEnabled", str));
}
if(mode & (RM_SYS | RM_TEST)) {
CRegKey mga;
ERRTHROW( mga.Create(HKEY_LOCAL_MACHINE, rootreg) );
! if(mode & RM_SYS) ERRTHROW( mga.SetStringValue( "ExternalEditorEnabled", str));
}
}
***************
*** 491,500 ****
CRegKey mga;
ERRTHROW( mga.Create(HKEY_CURRENT_USER, rootreg) );
! ERRTHROW( mga.SetValue(str, "ExternalEditor") );
}
if(mode & (RM_SYS | RM_TEST)) {
CRegKey mga;
ERRTHROW( mga.Create(HKEY_LOCAL_MACHINE, rootreg) );
! if(mode & RM_SYS) ERRTHROW( mga.SetValue(str, "ExternalEditor") );
}
}
--- 491,500 ----
CRegKey mga;
ERRTHROW( mga.Create(HKEY_CURRENT_USER, rootreg) );
! ERRTHROW( mga.SetStringValue( "ExternalEditor", str));
}
if(mode & (RM_SYS | RM_TEST)) {
CRegKey mga;
ERRTHROW( mga.Create(HKEY_LOCAL_MACHINE, rootreg) );
! if(mode & RM_SYS) ERRTHROW( mga.SetStringValue( "ExternalEditor", str));
}
}
***************
*** 542,551 ****
CRegKey mga;
ERRTHROW( mga.Create(HKEY_CURRENT_USER, rootreg) );
! ERRTHROW( mga.SetValue(str, "LabelAvoidance") );
}
if(mode & (RM_SYS | RM_TEST)) {
CRegKey mga;
ERRTHROW( mga.Create(HKEY_LOCAL_MACHINE, rootreg) );
! if(mode & RM_SYS) ERRTHROW( mga.SetValue(str, "LabelAvoidance") );
}
}
--- 542,551 ----
CRegKey mga;
ERRTHROW( mga.Create(HKEY_CURRENT_USER, rootreg) );
! ERRTHROW( mga.SetStringValue( "LabelAvoidance", str));
}
if(mode & (RM_SYS | RM_TEST)) {
CRegKey mga;
ERRTHROW( mga.Create(HKEY_LOCAL_MACHINE, rootreg) );
! if(mode & RM_SYS) ERRTHROW( mga.SetStringValue( "LabelAvoidance", str));
}
}
***************
*** 553,560 ****
}
!
!
! STDMETHODIMP CMgaRegistrar::get_ScriptEngine(regaccessmode_enum mode, BSTR *path)
! {
CHECK_OUT(path);
--- 553,557 ----
}
! STDMETHODIMP CMgaRegistrar::get_ScriptEngine(regaccessmode_enum mode, BSTR *path) {
CHECK_OUT(path);
***************
*** 589,594 ****
}
! STDMETHODIMP CMgaRegistrar::put_ScriptEngine(regaccessmode_enum mode, BSTR path)
! {
COMTRY
{
--- 586,590 ----
}
! STDMETHODIMP CMgaRegistrar::put_ScriptEngine(regaccessmode_enum mode, BSTR path) {
COMTRY
{
***************
*** 598,607 ****
CRegKey mga;
ERRTHROW( mga.Create(HKEY_CURRENT_USER, rootreg) );
! ERRTHROW( mga.SetValue(str, "ScriptEngine") );
}
if(mode & (RM_SYS | RM_TEST)) {
CRegKey mga;
ERRTHROW( mga.Create(HKEY_LOCAL_MACHINE, rootreg) );
! if(mode & RM_SYS) ERRTHROW( mga.SetValue(str, "ScriptEngine") );
}
}
--- 594,603 ----
CRegKey mga;
ERRTHROW( mga.Create(HKEY_CURRENT_USER, rootreg) );
! ERRTHROW( mga.SetStringValue("ScriptEngine", str) );//z7
}
if(mode & (RM_SYS | RM_TEST)) {
CRegKey mga;
ERRTHROW( mga.Create(HKEY_LOCAL_MACHINE, rootreg) );
! if(mode & RM_SYS) ERRTHROW( mga.SetStringValue("ScriptEngine", str) );//z7
}
}
***************
*** 609,613 ****
}
-
STDMETHODIMP CMgaRegistrar::get_Paradigms(regaccessmode_enum mode, VARIANT *names)
{
--- 605,608 ----
***************
*** 872,883 ****
! ERRTHROW( par.SetValue(PutInCString(guid3), "CurrentVersion") );
if (!cver.IsEmpty()) {
! ERRTHROW( par.SetValue(PutInCString(guid3), cver) );
}
CRegKey parg;
ERRTHROW( parg.Create(par, PutInCString(guid3)) );
! ERRTHROW( parg.SetValue(PutInCString(connstr), "ConnStr") );
}
if(mode & (RM_SYS | RM_TEST)) {
--- 867,878 ----
! ERRTHROW( par.SetStringValue( "CurrentVersion", PutInCString(guid3)));
if (!cver.IsEmpty()) {
! ERRTHROW( par.SetStringValue( cver, PutInCString(guid3)));
}
CRegKey parg;
ERRTHROW( parg.Create(par, PutInCString(guid3)) );
! ERRTHROW( parg.SetStringValue( "ConnStr", PutInCString(connstr)));
}
if(mode & (RM_SYS | RM_TEST)) {
***************
*** 899,913 ****
CRegKey parg2;
ERRTHROW( parg2.Create(par, gg) );
! ERRTHROW( parg2.SetValue(gc, "ConnStr") );
}
! ERRTHROW( par.SetValue(PutInCString(guid3), "CurrentVersion") );
if (!cver.IsEmpty()) {
! ERRTHROW( par.SetValue(PutInCString(guid3), cver) );
}
CRegKey parg;
ERRTHROW( parg.Create(par, PutInCString(guid3)) );
! ERRTHROW( parg.SetValue(PutInCString(connstr), "ConnStr") );
}
else {
--- 894,908 ----
CRegKey parg2;
ERRTHROW( parg2.Create(par, gg) );
! ERRTHROW( parg2.SetStringValue( "ConnStr", gc) );
}
! ERRTHROW( par.SetStringValue( "CurrentVersion", PutInCString(guid3)));
if (!cver.IsEmpty()) {
! ERRTHROW( par.SetStringValue( cver, PutInCString(guid3)));
}
CRegKey parg;
ERRTHROW( parg.Create(par, PutInCString(guid3)) );
! ERRTHROW( parg.SetStringValue( "ConnStr", PutInCString(connstr)));
}
else {
***************
*** 1314,1318 ****
err = comp.Open(comps, name, KEY_READ);
DWORD type2;
! if(err == ERROR_SUCCESS) err = comp.QueryValue(type2, "Type");
if(err == ERROR_SUCCESS &&
(type2 & COMPONENTTYPE_SYSREGREF) != 0) {
--- 1309,1313 ----
err = comp.Open(comps, name, KEY_READ);
DWORD type2;
! if(err == ERROR_SUCCESS) err = comp.QueryDWORDValue( "Type", type2);
if(err == ERROR_SUCCESS &&
(type2 & COMPONENTTYPE_SYSREGREF) != 0) {
***************
*** 1350,1354 ****
err = comp.Open(comps, name, KEY_READ);
DWORD type2;
! if(err == ERROR_SUCCESS) err = comp.QueryValue(type2, "Type");
if(err == ERROR_SUCCESS &&
!(type2 & COMPONENTTYPE_ALL)) break; // none of the component types
--- 1345,1349 ----
err = comp.Open(comps, name, KEY_READ);
DWORD type2;
! if(err == ERROR_SUCCESS) err = comp.QueryDWORDValue( "Type", type2);
if(err == ERROR_SUCCESS &&
!(type2 & COMPONENTTYPE_ALL)) break; // none of the component types
***************
*** 1386,1394 ****
ERRTHROW( comp.Create(comps, PutInCString(progid)) );
! ERRTHROW( comp.SetValue((DWORD)type, "Type") );
! ERRTHROW( comp.SetValue(PutInCString(desc), "Description") );
if(paradigms.Length()) {
! ERRTHROW( comp.SetValue(PutInCString(paradigms), "Paradigm") );
}
}
--- 1381,1389 ----
ERRTHROW( comp.Create(comps, PutInCString(progid)) );
! ERRTHROW( comp.SetDWORDValue( "Type", (DWORD)type));
! ERRTHROW( comp.SetStringValue( "Description", PutInCString(desc)));
if(paradigms.Length()) {
! ERRTHROW( comp.SetStringValue( "Paradigm", PutInCString(paradigms)));
}
}
***************
*** 1402,1410 ****
ERRTHROW( comp.Create(comps, PutInCString(progid)) );
! ERRTHROW( comp.SetValue((DWORD)type, "Type") );
! ERRTHROW( comp.SetValue(PutInCString(desc), "Description") );
if(paradigms.Length()) {
! ERRTHROW( comp.SetValue(PutInCString(paradigms), "Paradigm") );
}
}
--- 1397,1405 ----
ERRTHROW( comp.Create(comps, PutInCString(progid)) );
! ERRTHROW( comp.SetDWORDValue( "Type", (DWORD)type));
! ERRTHROW( comp.SetStringValue( "Description", PutInCString(desc)));
if(paradigms.Length()) {
! ERRTHROW( comp.SetStringValue( "Paradigm", PutInCString(paradigms)));
}
}
***************
*** 1433,1437 ****
if(res == ERROR_SUCCESS) {
DWORD type2;
! ERRTHROW( comp.QueryValue(type2, "Type") );
if((type2 & COMPONENTTYPE_ALL)) {
--- 1428,1432 ----
if(res == ERROR_SUCCESS) {
DWORD type2;
! ERRTHROW( comp.QueryDWORDValue( "Type", type2) );
if((type2 & COMPONENTTYPE_ALL)) {
***************
*** 1449,1453 ****
if(res == ERROR_SUCCESS) {
DWORD type2;
! ERRTHROW( comp.QueryValue(type2, "Type") );
if((type2 & COMPONENTTYPE_ALL)) {
--- 1444,1448 ----
if(res == ERROR_SUCCESS) {
DWORD type2;
! ERRTHROW( comp.QueryDWORDValue( "Type", type2) );
if((type2 & COMPONENTTYPE_ALL)) {
***************
*** 1477,1481 ****
CRegKey comp;
res = comp.Open(comps, PutInCString(progid), KEY_READ);
! if(!res) comp.QueryValue(type2, "Type");
}
--- 1472,1476 ----
CRegKey comp;
res = comp.Open(comps, PutInCString(progid), KEY_READ);
! if(!res) comp.QueryDWORDValue( "Type", type2);
}
***************
*** 1514,1522 ****
if(res == ERROR_SUCCESS) {
DWORD type2;
! ERRTHROW( comp.QueryValue(type2, "Type" ));
if((type2 & COMPONENTTYPE_ALL)) {
if(!newVal) { ERRTHROW( comp.DeleteValue(PutInCString(name)) ); }
! else { ERRTHROW( comp.SetValue(PutInCString(newVal), PutInCString(name)) ); }
}
}
--- 1509,1517 ----
if(res == ERROR_SUCCESS) {
DWORD type2;
! ERRTHROW( comp.QueryDWORDValue( "Type", type2));
if((type2 & COMPONENTTYPE_ALL)) {
if(!newVal) { ERRTHROW( comp.DeleteValue(PutInCString(name)) ); }
! else { ERRTHROW( comp.SetStringValue( PutInCString(name), PutInCString(newVal))); }
}
}
***************
*** 1528,1536 ****
if(res == ERROR_SUCCESS) {
DWORD type2;
! ERRTHROW( comp.QueryValue(type2, "Type" ));
if((mode & RM_SYS) && (type2 & COMPONENTTYPE_ALL)) {
if(!newVal) { ERRTHROW( comp.DeleteValue(PutInCString(name)) ); }
! else { ERRTHROW( comp.SetValue(PutInCString(newVal), PutInCString(name)) ); }
}
}
--- 1523,1531 ----
if(res == ERROR_SUCCESS) {
DWORD type2;
! ERRTHROW( comp.QueryDWORDValue( "Type", type2));
if((mode & RM_SYS) && (type2 & COMPONENTTYPE_ALL)) {
if(!newVal) { ERRTHROW( comp.DeleteValue(PutInCString(name)) ); }
! else { ERRTHROW( comp.SetStringValue( PutInCString(name), PutInCString(newVal))); }
}
}
***************
*** 1553,1557 ****
if(res == ERROR_SUCCESS) {
DWORD type2;
! ERRTHROW( comp.QueryValue(type2, "Type" ));
if((type2 & COMPONENTTYPE_ALL)) {
--- 1548,1552 ----
if(res == ERROR_SUCCESS) {
DWORD type2;
! ERRTHROW( comp.QueryDWORDValue( "Type", type2));
if((type2 & COMPONENTTYPE_ALL)) {
***************
*** 1567,1571 ****
if(res == ERROR_SUCCESS) {
DWORD type2;
! ERRTHROW( comp.QueryValue(type2, "Type"));
if((type2 & COMPONENTTYPE_ALL)) {
--- 1562,1566 ----
if(res == ERROR_SUCCESS) {
DWORD type2;
! ERRTHROW( comp.QueryDWORDValue( "Type", type2));
if((type2 & COMPONENTTYPE_ALL)) {
***************
*** 1661,1665 ****
DWORD comptype;
! if( comp.QueryValue(comptype, "Type") != ERROR_SUCCESS) continue;
if( comptype & COMPONENTTYPE_SYSREGREF) {
--- 1656,1660 ----
DWORD comptype;
! if( comp.QueryDWORDValue( "Type", comptype) != ERROR_SUCCESS) continue;
if( comptype & COMPONENTTYPE_SYSREGREF) {
***************
*** 1668,1672 ****
CRegKey syscomp;
res = syscomp.Open(syscomps, name, KEY_READ);
! if(!res) res = syscomp.QueryValue(comptype, "Type");
}
if(res != ERROR_SUCCESS) { // delete dangling SYSREGREF-s
--- 1663,1667 ----
CRegKey syscomp;
res = syscomp.Open(syscomps, name, KEY_READ);
! if(!res) res = syscomp.QueryDWORDValue( "Type", comptype);
}
if(res != ERROR_SUCCESS) { // delete dangling SYSREGREF-s
***************
*** 1684,1688 ****
DWORD count;
! if( assocs.QueryValue(NULL, paradigm2, &count) != ERROR_SUCCESS ) continue;
}
ret.Add(name);
--- 1679,1683 ----
DWORD count;
! if( assocs.QueryValue(paradigm2, NULL, NULL, &count) != ERROR_SUCCESS ) continue;
}
ret.Add(name);
***************
*** 1708,1712 ****
DWORD comptype;
! if( comp.QueryValue(comptype, "Type") != ERROR_SUCCESS) continue;
if( ((componenttype_enum)comptype & type) == 0 ) continue;
--- 1703,1707 ----
DWORD comptype;
! if( comp.QueryDWORDValue( "Type", comptype) != ERROR_SUCCESS) continue;
if( ((componenttype_enum)comptype & type) == 0 ) continue;
***************
*** 1717,1721 ****
DWORD count;
! if( assocs.QueryValue(NULL, paradigm2, &count) != ERROR_SUCCESS ) continue;
}
--- 1712,1716 ----
DWORD count;
! if( assocs.QueryValue( paradigm2, NULL, NULL, &count) != ERROR_SUCCESS ) continue;
}
***************
*** 1754,1758 ****
if(res == ERROR_SUCCESS) {
DWORD comptype;
! ERRTHROW( comp.QueryValue(comptype, "Type") );
if(comptype & COMPONENTTYPE_SYSREGREF) {
--- 1749,1753 ----
if(res == ERROR_SUCCESS) {
DWORD comptype;
! ERRTHROW( comp.QueryDWORDValue( "Type", comptype) );
if(comptype & COMPONENTTYPE_SYSREGREF) {
***************
*** 1793,1797 ****
somethingfound = true;
DWORD comptype;
! ERRTHROW( comp.QueryValue(comptype, "Type") );
if( ((componenttype_enum)comptype & COMPONENTTYPE_PARADIGM_INDEPENDENT) != 0 ) {
--- 1788,1792 ----
somethingfound = true;
DWORD comptype;
! ERRTHROW( comp.QueryDWORDValue( "Type", comptype) );
if( ((componenttype_enum)comptype & COMPONENTTYPE_PARADIGM_INDEPENDENT) != 0 ) {
***************
*** 1847,1854 ****
if(!res) res = ( comps.Create(mga, "Components") );
if(!res) res = ( comp.Create(comps, pname) );
! if(!res) res = ( comp.SetValue((DWORD)COMPONENTTYPE_SYSREGREF, "Type") );
}
if(!res) res = assocs.Create(comp, "Associated");
! if(!res) assocs.SetValue("", PutInCString(paradigm));
if(!res) somethingdone = true;
if(res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS;
--- 1842,1849 ----
if(!res) res = ( comps.Create(mga, "Components") );
if(!res) res = ( comp.Create(comps, pname) );
! if(!res) res = ( comp.SetDWORDValue( "Type", (DWORD)COMPONENTTYPE_SYSREGREF));
}
if(!res) res = assocs.Create(comp, "Associated");
! if(!res) assocs.SetStringValue( PutInCString(paradigm), "");
if(!res) somethingdone = true;
if(res == ERROR_FILE_NOT_FOUND) res = ERROR_SUCCESS;
***************
*** 1861,1865 ****
CRegKey assocs;
if(!res) res = assocs.Create(comp, "Associated");
! if(!res) res = assocs.SetValue("", PutInCString(paradigm));
}
else {
--- 1856,1860 ----
CRegKey assocs;
if(!res) res = assocs.Create(comp, "Associated");
! if(!res) res = assocs.SetStringValue( PutInCString(paradigm), "");
}
else {
***************
*** 1931,1935 ****
res = acomp.Open(comp,"Associated", KEY_READ);
! if(res == ERROR_SUCCESS) res = acomp.QueryValue(NULL, parc, &dummy);
if(res != ERROR_SUCCESS && res != ERROR_ACCESS_DENIED && res != ERROR_FILE_NOT_FOUND) ERRTHROW(res);
}
--- 1926,1930 ----
res = acomp.Open(comp,"Associated", KEY_READ);
! if(res == ERROR_SUCCESS) res = acomp.QueryValue( parc, NULL, NULL, &dummy);
if(res != ERROR_SUCCESS && res != ERROR_ACCESS_DENIED && res != ERROR_FILE_NOT_FOUND) ERRTHROW(res);
}
***************
*** 1940,1944 ****
if(res == ERROR_SUCCESS) res = acomp.Open(comp,"Associated", KEY_READ);
! if(res == ERROR_SUCCESS) res = acomp.QueryValue(NULL, parc, &dummy);
if(res != ERROR_SUCCESS && res != ERROR_ACCESS_DENIED && res != ERROR_FILE_NOT_FOUND) ERRTHROW(res);
--- 1935,1939 ----
if(res == ERROR_SUCCESS) res = acomp.Open(comp,"Associated", KEY_READ);
! if(res == ERROR_SUCCESS) res = acomp.QueryValue( parc, NULL, NULL, &dummy);
if(res != ERROR_SUCCESS && res != ERROR_ACCESS_DENIED && res != ERROR_FILE_NOT_FOUND) ERRTHROW(res);
Index: MgaUtil.def
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/MgaUtil/MgaUtil.def,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** MgaUtil.def 5 Jul 2000 19:21:00 -0000 1.1
--- MgaUtil.def 26 Jan 2005 17:30:52 -0000 1.2
***************
*** 2,6 ****
LIBRARY "MgaUtil"
- DESCRIPTION 'MgaUtil Windows Dynamic Link Library'
EXPORTS
--- 2,5 ----
Index: MgaUtil.rc
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/MgaUtil/MgaUtil.rc,v
retrieving revision 1.44
retrieving revision 1.45
diff -C2 -d -r1.44 -r1.45
*** MgaUtil.rc 2 Dec 2004 22:02:14 -0000 1.44
--- MgaUtil.rc 26 Jan 2005 17:30:53 -0000 1.45
***************
*** 1,3 ****
! //Microsoft Developer Studio generated resource script.
//
#include "resource.h"
--- 1,3 ----
! // Microsoft Visual C++ generated resource script.
//
#include "resource.h"
***************
*** 27,31 ****
IDD_DIALOG_LIST DIALOGEX 0, 0, 232, 106
! STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
FONT 8, "MS Sans Serif", 0, 0, 0x1
BEGIN
--- 27,31 ----
IDD_DIALOG_LIST DIALOGEX 0, 0, 232, 106
! STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
FONT 8, "MS Sans Serif", 0, 0, 0x1
BEGIN
***************
*** 39,44 ****
END
! IDD_METADLG DIALOG DISCARDABLE 0, 0, 302, 231
! STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "Select Paradigm"
FONT 8, "MS Sans Serif"
--- 39,44 ----
END
! IDD_METADLG DIALOG 0, 0, 302, 231
! STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "Select Paradigm"
FONT 8, "MS Sans Serif"
***************
*** 65,70 ****
END
! IDD_GMEDLG DIALOG DISCARDABLE 0, 0, 247, 366
! STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "GME properties"
FONT 8, "MS Sans Serif"
--- 65,70 ----
END
! IDD_GMEDLG DIALOG 0, 0, 247, 366
! STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "GME properties"
FONT 8, "MS Sans Serif"
***************
*** 111,118 ****
END
! IDD_COMPDLG DIALOG DISCARDABLE 0, 0, 304, 237
! STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "Components"
! FONT 8, "MS Sans Serif"
BEGIN
DEFPUSHBUTTON "Close",IDOK,7,204,55,15
--- 111,118 ----
END
! IDD_COMPDLG DIALOGEX 0, 0, 304, 237
! STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "Components"
! FONT 8, "MS Sans Serif", 0, 0, 0x0
BEGIN
DEFPUSHBUTTON "Close",IDOK,7,204,55,15
***************
*** 126,130 ****
LVS_SHAREIMAGELISTS | LVS_NOLABELWRAP | LVS_AUTOARRANGE |
WS_BORDER | WS_TABSTOP,5,35,255,135
! LTEXT "Register:",IDC_STATIC,141,180,69,10
CONTROL "Systemwide",IDC_RADIOSYS,"Button",BS_AUTORADIOBUTTON |
WS_GROUP | WS_TABSTOP,141,190,53,10
--- 126,130 ----
LVS_SHAREIMAGELISTS | LVS_NOLABELWRAP | LVS_AUTOARRANGE |
WS_BORDER | WS_TABSTOP,5,35,255,135
! LTEXT "Register:",IDC_STATIC,141,180,69,8
CONTROL "Systemwide",IDC_RADIOSYS,"Button",BS_AUTORADIOBUTTON |
WS_GROUP | WS_TABSTOP,141,190,53,10
***************
*** 133,147 ****
CONTROL "Both",IDC_RADIOBOTH,"Button",BS_AUTORADIOBUTTON,141,210,
31,10
! LTEXT "Show components:",IDC_STATIC,216,180,62,8
CONTROL "Active",IDC_ACTIVEDISP,"Button",BS_AUTORADIOBUTTON |
WS_GROUP | WS_TABSTOP,214,190,36,10
CONTROL "Active&&Inactive",IDC_ACTIVE_INACTIVE,"Button",
! BS_AUTORADIOBUTTON,213,200,65,10
CONTROL "All",IDC_ALLCOMPS,"Button",BS_AUTORADIOBUTTON,214,210,
25,10
END
! IDD_PROPERTIES_DIALOG DIALOG DISCARDABLE 0, 0, 157, 258
! STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "Model Properties"
FONT 8, "MS Sans Serif"
--- 133,147 ----
CONTROL "Both",IDC_RADIOBOTH,"Button",BS_AUTORADIOBUTTON,141,210,
31,10
! LTEXT "Show components:",IDC_STATIC,214,180,62,8
CONTROL "Active",IDC_ACTIVEDISP,"Button",BS_AUTORADIOBUTTON |
WS_GROUP | WS_TABSTOP,214,190,36,10
CONTROL "Active&&Inactive",IDC_ACTIVE_INACTIVE,"Button",
! BS_AUTORADIOBUTTON,214,200,65,10
CONTROL "All",IDC_ALLCOMPS,"Button",BS_AUTORADIOBUTTON,214,210,
25,10
END
! IDD_PROPERTIES_DIALOG DIALOG 0, 0, 157, 258
! STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "Model Properties"
FONT 8, "MS Sans Serif"
***************
*** 182,186 ****
5100 DIALOGEX 0, 0, 49, 73
! STYLE DS_MODALFRAME | WS_POPUP
FONT 8, "MS Sans Serif", 0, 0, 0x1
BEGIN
--- 182,186 ----
5100 DIALOGEX 0, 0, 49, 73
! STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP
FONT 8, "MS Sans Serif", 0, 0, 0x1
BEGIN
***************
*** 229,233 ****
IDD_CONNPROPERTIES_DIALOG DIALOGEX 0, 0, 157, 255
! STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "Connection Properties"
FONT 8, "MS Sans Serif", 0, 0, 0x1
--- 229,233 ----
IDD_CONNPROPERTIES_DIALOG DIALOGEX 0, 0, 157, 255
! STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "Connection Properties"
FONT 8, "MS Sans Serif", 0, 0, 0x1
***************
*** 266,271 ****
END
! IDD_PROGRESSDLG DIALOG DISCARDABLE 0, 0, 244, 70
! STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "Dialog"
FONT 8, "MS Sans Serif"
--- 266,271 ----
END
! IDD_PROGRESSDLG DIALOG 0, 0, 244, 70
! STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "Dialog"
FONT 8, "MS Sans Serif"
***************
*** 277,282 ****
END
! IDD_METAPURGEDIALOG DIALOG DISCARDABLE 0, 0, 371, 182
! STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "Dialog"
FONT 8, "MS Sans Serif"
--- 277,282 ----
END
! IDD_METAPURGEDIALOG DIALOG 0, 0, 371, 182
! STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "Dialog"
FONT 8, "MS Sans Serif"
***************
*** 296,300 ****
IDD_REGISTRY_BROWSER DIALOGEX 0, 0, 406, 220
! STYLE WS_POPUP | WS_CAPTION | WS_THICKFRAME
CAPTION "Registry Browser"
FONT 8, "MS Sans Serif", 0, 0, 0x1
--- 296,300 ----
IDD_REGISTRY_BROWSER DIALOGEX 0, 0, 406, 220
! STYLE DS_SETFONT | WS_POPUP | WS_CAPTION | WS_THICKFRAME
CAPTION "Registry Browser"
FONT 8, "MS Sans Serif", 0, 0, 0x1
***************
*** 324,329 ****
END
! IDD_COMPINFODLG DIALOG DISCARDABLE 0, 0, 268, 132
! STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "Component information"
FONT 8, "MS Sans Serif"
--- 324,329 ----
END
! IDD_COMPINFODLG DIALOG 0, 0, 268, 132
! STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "Component information"
FONT 8, "MS Sans Serif"
***************
*** 348,353 ****
END
! IDD_FOLDERPROPERTIES_DIALOG DIALOG DISCARDABLE 0, 0, 157, 175
! STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "Folder Properties"
FONT 8, "MS Sans Serif"
--- 348,353 ----
END
! IDD_FOLDERPROPERTIES_DIALOG DIALOG 0, 0, 157, 175
! STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "Folder Properties"
FONT 8, "MS Sans Serif"
***************
*** 379,383 ****
IDD_ANNOTATION_BROWSER DIALOGEX 0, 0, 406, 271
! STYLE WS_POPUP | WS_CAPTION | WS_THICKFRAME
CAPTION "Annotations"
FONT 8, "MS Sans Serif", 0, 0, 0x1
--- 379,383 ----
IDD_ANNOTATION_BROWSER DIALOGEX 0, 0, 406, 271
! STYLE DS_SETFONT | WS_POPUP | WS_CAPTION | WS_THICKFRAME
CAPTION "Annotations"
FONT 8, "MS Sans Serif", 0, 0, 0x1
***************
*** 423,428 ****
END
! IDD_XSLTDIAL DIALOG DISCARDABLE 0, 0, 372, 151
! STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "XSL Transformation"
FONT 8, "MS Sans Serif"
--- 423,428 ----
END
! IDD_XSLTDIAL DIALOG 0, 0, 372, 151
! STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "XSL Transformation"
FONT 8, "MS Sans Serif"
***************
*** 441,446 ****
END
! IDD_CLOSUREDLG DIALOG DISCARDABLE 0, 0, 279, 238
! STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "Selective Closure"
FONT 8, "MS Sans Serif"
--- 441,446 ----
END
! IDD_CLOSUREDLG DIALOG 0, 0, 279, 238
! STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "Selective Closure"
FONT 8, "MS Sans Serif"
***************
*** 506,511 ****
END
! IDD_CLOSURERES DIALOG DISCARDABLE 0, 0, 275, 127
! STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "Selective Closure Result"
FONT 8, "MS Sans Serif"
--- 506,511 ----
END
! IDD_CLOSURERES DIALOG 0, 0, 275, 127
! STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "Selective Closure Result"
FONT 8, "MS Sans Serif"
***************
*** 518,523 ****
END
! IDD_CLOSURESMARTCP DIALOG DISCARDABLE 0, 0, 226, 58
! STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "Smart copy dialog"
FONT 8, "MS Sans Serif"
--- 518,523 ----
END
! IDD_CLOSURESMARTCP DIALOG 0, 0, 226, 58
! STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "Smart copy dialog"
FONT 8, "MS Sans Serif"
***************
*** 534,539 ****
END
! IDD_CLOSUREKINDSEL DIALOG DISCARDABLE 0, 0, 186, 95
! STYLE DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "Include the following children"
FONT 8, "MS Sans Serif"
--- 534,539 ----
END
! IDD_CLOSUREKINDSEL DIALOG 0, 0, 186, 95
! STYLE DS_SETFONT | DS_MODALFRAME | WS_POPUP | WS_CAPTION | WS_SYSMENU
CAPTION "Include the following children"
FONT 8, "MS Sans Serif"
***************
*** 560,574 ****
//
! 1 TEXTINCLUDE DISCARDABLE
BEGIN
"resource.h\0"
END
! 2 TEXTINCLUDE DISCARDABLE
BEGIN
"#include ""afxres.h""\0"
END
! 3 TEXTINCLUDE DISCARDABLE
BEGIN
"#define _AFX_NO_SPLITTER_RESOURCES\r\n"
--- 560,574 ----
//
! 1 TEXTINCLUDE
BEGIN
"resource.h\0"
END
! 2 TEXTINCLUDE
BEGIN
"#include ""afxres.h""\0"
END
! 3 TEXTINCLUDE
BEGIN
"#define _AFX_NO_SPLITTER_RESOURCES\r\n"
***************
*** 592,596 ****
- #ifndef _MAC
/////////////////////////////////////////////////////////////////////////////
//
--- 592,595 ----
***************
*** 615,627 ****
BLOCK "040904B0"
BEGIN
! VALUE "CompanyName", "\0"
! VALUE "FileDescription", "MgaUtil DLL\0"
! VALUE "FileVersion", "1, 0, 0, 1\0"
! VALUE "InternalName", "MgaUtil\0"
! VALUE "LegalCopyright", "Copyright (C) 2000-2004\0"
! VALUE "LegalTrademarks", "\0"
! VALUE "OriginalFilename", "MgaUtil.DLL\0"
! VALUE "ProductName", "MgaUtil Dynamic Link Library\0"
! VALUE "ProductVersion", "1, 0, 0, 1\0"
END
END
--- 614,624 ----
BLOCK "040904B0"
BEGIN
! VALUE "FileDescription", "MgaUtil DLL"
! VALUE "FileVersion", "1, 0, 0, 1"
! VALUE "InternalName", "MgaUtil"
! VALUE "LegalCopyright", "Copyright (C) 2000-2004"
! VALUE "OriginalFilename", "MgaUtil.DLL"
! VALUE "ProductName", "MgaUtil Dynamic Link Library"
! VALUE "ProductVersion", "1, 0, 0, 1"
END
END
***************
*** 632,637 ****
END
- #endif // !_MAC
-
/////////////////////////////////////////////////////////////////////////////
--- 629,632 ----
***************
*** 640,652 ****
//
! IDR_MGAUTIL REGISTRY DISCARDABLE "MgaUtilLib.rgs"
! IDR_MGARESOLVER REGISTRY DISCARDABLE "MgaResolver.rgs"
! IDR_MGAREGISTRAR REGISTRY DISCARDABLE "MgaRegistrar.rgs"
! IDR_MGALAUNCHER REGISTRY DISCARDABLE "MgaLauncher.rgs"
! IDR_MGAPROGRESSDLG REGISTRY DISCARDABLE "MgaProgressDlg.rgs"
! IDR_COMPONENTPROXY REGISTRY DISCARDABLE "ComponentProxy.rgs"
! IDR_MGAXSLTFILESEL REGISTRY DISCARDABLE "MgaXsltFileSel.rgs"
! IDR_MGACLOSURE REGISTRY DISCARDABLE "MgaClosure.rgs"
! IDR_MGAEVENTLOGGER REGISTRY DISCARDABLE "MgaEventLogger.rgs"
/////////////////////////////////////////////////////////////////////////////
--- 635,647 ----
//
! IDR_MGAUTIL REGISTRY "MgaUtilLib.rgs"
! IDR_MGARESOLVER REGISTRY "MgaResolver.rgs"
! IDR_MGAREGISTRAR REGISTRY "MgaRegistrar.rgs"
! IDR_MGALAUNCHER REGISTRY "MgaLauncher.rgs"
! IDR_MGAPROGRESSDLG REGISTRY "MgaProgressDlg.rgs"
! IDR_COMPONENTPROXY REGISTRY "ComponentProxy.rgs"
! IDR_MGAXSLTFILESEL REGISTRY "MgaXsltFileSel.rgs"
! IDR_MGACLOSURE REGISTRY "MgaClosure.rgs"
! IDR_MGAEVENTLOGGER REGISTRY "MgaEventLogger.rgs"
/////////////////////////////////////////////////////////////////////////////
***************
*** 656,660 ****
#ifdef APSTUDIO_INVOKED
! GUIDELINES DESIGNINFO DISCARDABLE
BEGIN
IDD_DIALOG_LIST, DIALOG
--- 651,655 ----
#ifdef APSTUDIO_INVOKED
! GUIDELINES DESIGNINFO
BEGIN
IDD_DIALOG_LIST, DIALOG
***************
*** 806,814 ****
// Icon with lowest ID value placed first to ensure application icon
// remains consistent on all systems.
! IDI_ICON_REGHERE ICON DISCARDABLE "res\\icon_reghere.ico"
! IDI_ICON_REGMETA ICON DISCARDABLE "res\\icon_regmeta.ico"
! IDI_ICON_REGINHERIT ICON DISCARDABLE "res\\icon_reginherit.ico"
! IDI_ICON_REGUNDEF ICON DISCARDABLE "res\\icon_regundef.ico"
! IDI_ICON_REGINVALID ICON DISCARDABLE "res\\icon_reginvalid.ico"
/////////////////////////////////////////////////////////////////////////////
--- 801,809 ----
// Icon with lowest ID value placed first to ensure application icon
// remains consistent on all systems.
! IDI_ICON_REGHERE ICON "res\\icon_reghere.ico"
! IDI_ICON_REGMETA ICON "res\\icon_regmeta.ico"
! IDI_ICON_REGINHERIT ICON "res\\icon_reginherit.ico"
! IDI_ICON_REGUNDEF ICON "res\\icon_regundef.ico"
! IDI_ICON_REGINVALID ICON "res\\icon_reginvalid.ico"
/////////////////////////////////////////////////////////////////////////////
***************
*** 817,821 ****
//
! IDR_CNTXMENU_REGBRW MENU DISCARDABLE
BEGIN
POPUP "Cntx"
--- 812,816 ----
//
! IDR_CNTXMENU_REGBRW MENU
BEGIN
POPUP "Cntx"
***************
*** 834,839 ****
//
! IDB_BITMAP1 BITMAP DISCARDABLE "res\\CompImageList.bmp"
! IDB_BITMAP2 BITMAP DISCARDABLE "res\\AddOnStatus.bmp"
#endif // English (U.S.) resources
/////////////////////////////////////////////////////////////////////////////
--- 829,834 ----
//
! IDB_BITMAP1 BITMAP "res\\CompImageList.bmp"
! IDB_BITMAP2 BITMAP "res\\AddOnStatus.bmp"
#endif // English (U.S.) resources
/////////////////////////////////////////////////////////////////////////////
Index: StdAfx.cpp
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/MgaUtil/StdAfx.cpp,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** StdAfx.cpp 5 Jul 2000 19:21:00 -0000 1.1
--- StdAfx.cpp 26 Jan 2005 17:30:53 -0000 1.2
***************
*** 7,13 ****
! #ifdef _ATL_STATIC_REGISTRY
#include <statreg.h>
#endif
- #include <atlimpl.cpp>
-
--- 7,11 ----
! #ifdef _ATL_STATIC_REGISTRY
#include <statreg.h>
#endif
Index: StdAfx.h
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/MgaUtil/StdAfx.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** StdAfx.h 13 Oct 2004 15:17:55 -0000 1.11
--- StdAfx.h 26 Jan 2005 17:30:53 -0000 1.12
***************
*** 7,15 ****
#define AFX_STDAFX_H__461F30A9_3BF0_11D4_B3F0_005004D38590__INCLUDED_
! #if _MSC_VER > 1000
! #pragma once
! #endif // _MSC_VER > 1000
! #define VC_EXTRALEAN // Exclude rarely-used stuff from Windows headers
#include <afxwin.h> // MFC core and standard components
--- 7,20 ----
#define AFX_STDAFX_H__461F30A9_3BF0_11D4_B3F0_005004D38590__INCLUDED_
! # if _MSC_VER > 1000
! # pragma once
! # endif // _MSC_VER > 1000
! #define STRICT
! #ifndef _WIN32_WINNT
! #define _WIN32_WINNT 0x0400
! #endif
!
! #define VC_EXTRALEAN // Exclude rarely-used stuff from Windows headers //zolmol7
#include <afxwin.h> // MFC core and standard components
***************
*** 36,41 ****
#endif // _AFX_NO_AFXCMN_SUPPORT
- #define _ATL_APARTMENT_THREADED
#include <atlbase.h>
//You may derive a class from CComModule and use it if you want to override
--- 41,48 ----
#endif // _AFX_NO_AFXCMN_SUPPORT
+ # undef _ATL_APARTMENT_THREADED
+ # undef _ATL_SINGLE_THREADED
+ # define _ATL_FREE_THREADED
#include <atlbase.h>
//You may derive a class from CComModule and use it if you want to override
***************
*** 58,66 ****
#include <list>
#include "CommonSmart.h"
#include "CommonError.h"
#include "CommonMfc.h"
#include "CommonMgaTrukk.h"
-
///////////////////////////////////////////////////////////////////
--- 65,74 ----
#include <list>
+ #include "MgaUtilLib.h"
#include "CommonSmart.h"
+ #include "CommonStl.h"
#include "CommonError.h"
#include "CommonMfc.h"
#include "CommonMgaTrukk.h"
///////////////////////////////////////////////////////////////////
***************
*** 70,74 ****
#include "Resource.h"
- #include "MgaUtilLib.h"
#include "PropertiesDlg.h"
#include "ConnPropertiesDlg.h"
--- 78,81 ----
Index: colorbtn.h
===================================================================
RCS file: /var/lib/gme/GMESRC/GME/MgaUtil/colorbtn.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** colorbtn.h 21 Nov 2001 01:57:00 -0000 1.2
--- colorbtn.h 26 Jan 2005 17:30:53 -0000 1.3
***************
*** 90,94 ****
// Use Serialize to store the color table in a file. Call at the document's Serialize()
! static void Serialize( CArchive& ar );
// If using Serialize, call Reset to reinitialize the color table at OnNewDocument()
--- 90,94 ----
// Use Serialize to store the color table in a file. Call at the document's Serialize()
! void Serialize( CArchive& ar );
// If using Serialize, call Reset to reinitialize the color table at OnNewDocument()
--- MgaUtil.dsp DELETED ---
- Previous message: [GME-commit] GMESRC/GME/Gme/AutoRoute ArGraph.cpp,1.5,1.6
- Next message: [GME-commit]
GMESRC/GME/ObjectInspector ObjectInspector.vcproj,NONE,1.1
ColourPopup.cpp,1.2,1.3 ColourPopup.h,1.2,1.3
ObjectInspector.def,1.1,1.2 ObjectInspectorCtl.h,1.12,1.13
Preference.cpp,1.33,1.34 StdAfx.h,1.6,1.7
ObjectInspector.dsp,1.16,NONE
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the GME-commit
mailing list