--- AccessDialog.cpp Sat Jul 19 10:21:34 2003 +++ AccessDialog.cpp.mod Sat Oct 18 17:02:59 2003 @@ -9,11 +9,51 @@ /* ## ## */ /* ## ------------------------------------------------------------------- ## */ /* ## ## */ +/* ## Intel Open Source License ## */ +/* ## ## */ +/* ## Copyright (c) 2001 Intel Corporation ## */ +/* ## All rights reserved. ## */ +/* ## Redistribution and use in source and binary forms, with or ## */ +/* ## without modification, are permitted provided that the following ## */ +/* ## conditions are met: ## */ +/* ## ## */ +/* ## Redistributions of source code must retain the above copyright ## */ +/* ## notice, this list of conditions and the following disclaimer. ## */ +/* ## ## */ +/* ## Redistributions in binary form must reproduce the above copyright ## */ +/* ## notice, this list of conditions and the following disclaimer in ## */ +/* ## the documentation and/or other materials provided with the ## */ +/* ## distribution. ## */ +/* ## ## */ +/* ## Neither the name of the Intel Corporation nor the names of its ## */ +/* ## contributors may be used to endorse or promote products derived ## */ +/* ## from this software without specific prior written permission. ## */ +/* ## ## */ +/* ## THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND ## */ +/* ## CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, ## */ +/* ## INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF ## */ +/* ## MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE ## */ +/* ## DISCLAIMED. IN NO EVENT SHALL THE INTEL OR ITS CONTRIBUTORS BE ## */ +/* ## LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, ## */ +/* ## OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, ## */ +/* ## PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, ## */ +/* ## OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY ## */ +/* ## THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR ## */ +/* ## TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT ## */ +/* ## OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY ## */ +/* ## OF SUCH DAMAGE. ## */ +/* ## ## */ +/* ## ------------------------------------------------------------------- ## */ +/* ## ## */ /* ## Remarks ...: ## */ /* ## ## */ /* ## ------------------------------------------------------------------- ## */ /* ## ## */ -/* ## Changes ...: 2003-04-25 (daniel.scheibli@edelbyte.org) ## */ +/* ## Changes ...: 2003-10-17 (daniel.scheibli@edelbyte.org) ## */ +/* ## - Moved to the use of the IOMTR_[OSFAMILY|OS|CPU]_* ## */ +/* ## global defines. ## */ +/* ## - Integrated the License Statement into this header. ## */ +/* ## 2003-04-25 (daniel.scheibli@edelbyte.org) ## */ /* ## - Updated the global debug flag (_DEBUG) handling ## */ /* ## of the source file (check for platform etc.). ## */ /* ## 2003-03-02 (joe@eiler.net) ## */ @@ -21,50 +61,7 @@ /* ## - Added new header holding the changelog. ## */ /* ## ## */ /* ######################################################################### */ -/* -Intel Open Source License - -Copyright (c) 2001 Intel Corporation -All rights reserved. -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: - - Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimer. - - Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - Neither the name of the Intel Corporation nor the names of its contributors - may be used to endorse or promote products derived from this software - without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ``AS IS'' -AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -ARE DISCLAIMED. IN NO EVENT SHALL THE INTEL OR ITS CONTRIBUTORS BE LIABLE -FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE -USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -*/ -// ========================================================================== -// Copyright (C) 1997-2000 Intel Corporation -// All rights reserved -// INTEL CORPORATION PROPRIETARY INFORMATION -// This software is supplied under the terms of a license agreement or -// nondisclosure agreement with Intel Corporation and may not be copied -// or disclosed except in accordance with the terms of that agreement. -// ========================================================================== -// -// AccessDialog.cpp: Implementation of the CAccessDialog class, which is -// responsible for the "Edit Access Specification" dialog. -// -////////////////////////////////////////////////////////////////////// #include "StdAfx.h" #include "AccessDialog.h" @@ -79,12 +76,12 @@ // will be a MFC hacker who could advice here. // [1] = http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vclib/html/_mfc_debug_new.asp // -#if defined (_WIN32) || defined (_WIN64) -#ifdef _DEBUG -#define new DEBUG_NEW -#undef THIS_FILE -static char THIS_FILE[] = __FILE__; -#endif +#if defined(IOMTR_OS_WIN32) || defined(IOMTR_OS_WIN64) + #ifdef _DEBUG + #define new DEBUG_NEW + #undef THIS_FILE + static char THIS_FILE[] = __FILE__; + #endif #endif --- AccessDialog.h Sat Jul 19 10:21:34 2003 +++ AccessDialog.h.mod Sat Oct 18 17:05:04 2003 @@ -1,50 +1,65 @@ -/* -Intel Open Source License - -Copyright (c) 2001 Intel Corporation -All rights reserved. -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: - - Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimer. - - Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - - Neither the name of the Intel Corporation nor the names of its contributors - may be used to endorse or promote products derived from this software - without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ``AS IS'' -AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -ARE DISCLAIMED. IN NO EVENT SHALL THE INTEL OR ITS CONTRIBUTORS BE LIABLE -FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE -USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -*/ -// ========================================================================== -// Copyright (C) 1997-2000 Intel Corporation -// All rights reserved -// INTEL CORPORATION PROPRIETARY INFORMATION -// This software is supplied under the terms of a license agreement or -// nondisclosure agreement with Intel Corporation and may not be copied -// or disclosed except in accordance with the terms of that agreement. -// ========================================================================== -// -// AccessDialog.h: Interface for the CAccessDialog class, which is -// responsible for the "Edit Access Specification" dialog. -// -////////////////////////////////////////////////////////////////////// - +/* ######################################################################### */ +/* ## ## */ +/* ## (Iometer) / AccessDialog.h ## */ +/* ## ## */ +/* ## ------------------------------------------------------------------- ## */ +/* ## ## */ +/* ## Job .......: Interface for the CAccessDialog class, which is ## */ +/* ## responsible for the "Edit Access Specification" ## */ +/* ## dialog. ## */ +/* ## ## */ +/* ## ------------------------------------------------------------------- ## */ +/* ## ## */ +/* ## Intel Open Source License ## */ +/* ## ## */ +/* ## Copyright (c) 2001 Intel Corporation ## */ +/* ## All rights reserved. ## */ +/* ## Redistribution and use in source and binary forms, with or ## */ +/* ## without modification, are permitted provided that the following ## */ +/* ## conditions are met: ## */ +/* ## ## */ +/* ## Redistributions of source code must retain the above copyright ## */ +/* ## notice, this list of conditions and the following disclaimer. ## */ +/* ## ## */ +/* ## Redistributions in binary form must reproduce the above copyright ## */ +/* ## notice, this list of conditions and the following disclaimer in ## */ +/* ## the documentation and/or other materials provided with the ## */ +/* ## distribution. ## */ +/* ## ## */ +/* ## Neither the name of the Intel Corporation nor the names of its ## */ +/* ## contributors may be used to endorse or promote products derived ## */ +/* ## from this software without specific prior written permission. ## */ +/* ## ## */ +/* ## THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND ## */ +/* ## CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, ## */ +/* ## INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF ## */ +/* ## MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE ## */ +/* ## DISCLAIMED. IN NO EVENT SHALL THE INTEL OR ITS CONTRIBUTORS BE ## */ +/* ## LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, ## */ +/* ## OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, ## */ +/* ## PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, ## */ +/* ## OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY ## */ +/* ## THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR ## */ +/* ## TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT ## */ +/* ## OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY ## */ +/* ## OF SUCH DAMAGE. ## */ +/* ## ## */ +/* ## ------------------------------------------------------------------- ## */ +/* ## ## */ +/* ## Remarks ...: ## */ +/* ## ## */ +/* ## ------------------------------------------------------------------- ## */ +/* ## ## */ +/* ## Changes ...: 2003-10-17 (daniel.scheibli@edelbyte.org) ## */ +/* ## - Moved to the use of the IOMTR_[OSFAMILY|OS|CPU]_* ## */ +/* ## global defines. ## */ +/* ## - Integrated the License Statement into this header. ## */ +/* ## - Added new header holding the changelog. ## */ +/* ## ## */ +/* ######################################################################### */ #ifndef ACCESS_DIALOG_DEFINED #define ACCESS_DIALOG_DEFINED + #if _MSC_VER >= 1000 #pragma once --- AccessSpecList.cpp Sat Jul 19 10:21:36 2003 +++ AccessSpecList.cpp.mod Sat Oct 18 21:43:12 2003 @@ -4,68 +4,65 @@ /* ## ## */ /* ## ------------------------------------------------------------------- ## */ /* ## ## */ -/* ## Job .......: ... ## */ +/* ## Job .......: Implementation of the AccessSpecList class, which is ## */ +/* ## in charge of keeping track of all the access ## */ +/* ## specifications available to the user. ## */ /* ## ## */ /* ## ------------------------------------------------------------------- ## */ /* ## ## */ -/* ## Remarks ...: ## */ +/* ## Intel Open Source License ## */ +/* ## ## */ +/* ## Copyright (c) 2001 Intel Corporation ## */ +/* ## All rights reserved. ## */ +/* ## Redistribution and use in source and binary forms, with or ## */ +/* ## without modification, are permitted provided that the following ## */ +/* ## conditions are met: ## */ +/* ## ## */ +/* ## Redistributions of source code must retain the above copyright ## */ +/* ## notice, this list of conditions and the following disclaimer. ## */ +/* ## ## */ +/* ## Redistributions in binary form must reproduce the above copyright ## */ +/* ## notice, this list of conditions and the following disclaimer in ## */ +/* ## the documentation and/or other materials provided with the ## */ +/* ## distribution. ## */ +/* ## ## */ +/* ## Neither the name of the Intel Corporation nor the names of its ## */ +/* ## contributors may be used to endorse or promote products derived ## */ +/* ## from this software without specific prior written permission. ## */ +/* ## ## */ +/* ## THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND ## */ +/* ## CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, ## */ +/* ## INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF ## */ +/* ## MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE ## */ +/* ## DISCLAIMED. IN NO EVENT SHALL THE INTEL OR ITS CONTRIBUTORS BE ## */ +/* ## LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, ## */ +/* ## OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, ## */ +/* ## PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, ## */ +/* ## OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY ## */ +/* ## THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR ## */ +/* ## TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT ## */ +/* ## OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY ## */ +/* ## OF SUCH DAMAGE. ## */ +/* ## ## */ +/* ## ------------------------------------------------------------------- ## */ +/* ## ## */ +/* ## Remarks ...: - Each access spec is defined by a Test_Spec ## */ +/* ## structure. There is always exactly one ## */ +/* ## AccessSpecList object in an instance of Iometer ## */ +/* ## (CGalileoApp::access_spec_list). ## */ /* ## ## */ /* ## ------------------------------------------------------------------- ## */ /* ## ## */ -/* ## Changes ...: 2003-04-25 (daniel.scheibli@edelbyte.org) ## */ +/* ## Changes ...: 2003-10-17 (daniel.scheibli@edelbyte.org) ## */ +/* ## - Moved to the use of the IOMTR_[OSFAMILY|OS|CPU]_* ## */ +/* ## global defines. ## */ +/* ## - Integrated the License Statement into this header. ## */ +/* ## 2003-04-25 (daniel.scheibli@edelbyte.org) ## */ /* ## - Updated the global debug flag (_DEBUG) handling ## */ /* ## of the source file (check for platform etc.). ## */ /* ## - Added new header holding the changelog. ## */ /* ## ## */ /* ######################################################################### */ -/* -Intel Open Source License - -Copyright (c) 2001 Intel Corporation -All rights reserved. -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: - - Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimer. - - Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - - Neither the name of the Intel Corporation nor the names of its contributors - may be used to endorse or promote products derived from this software - without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ``AS IS'' -AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -ARE DISCLAIMED. IN NO EVENT SHALL THE INTEL OR ITS CONTRIBUTORS BE LIABLE -FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE -USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -*/ -// ========================================================================== -// Copyright (C) 1997-2000 Intel Corporation -// All rights reserved -// INTEL CORPORATION PROPRIETARY INFORMATION -// This software is supplied under the terms of a license agreement or -// nondisclosure agreement with Intel Corporation and may not be copied -// or disclosed except in accordance with the terms of that agreement. -// ========================================================================== -// -// AccessSpecList.cpp: Implementation of the AccessSpecList class, which is -// in charge of keeping track of all the access specifications available to -// the user. Each access spec is defined by a Test_Spec structure. There is -// always exactly one AccessSpecList object in an instance of Iometer -// (CGalileoApp::access_spec_list). -// -/////////////////////////////////////////////////////////////// -/* ######################################################################### */ #include "stdafx.h" @@ -83,12 +80,12 @@ // will be a MFC hacker who could advice here. // [1] = http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vclib/html/_mfc_debug_new.asp // -#if defined (_WIN32) || defined (_WIN64) -#ifdef _DEBUG -#define new DEBUG_NEW -#undef THIS_FILE -static char THIS_FILE[] = __FILE__; -#endif +#if defined(IOMTR_OS_WIN32) || defined(IOMTR_OS_WIN64) + #ifdef _DEBUG + #define new DEBUG_NEW + #undef THIS_FILE + static char THIS_FILE[] = __FILE__; + #endif #endif --- AccessSpecList.h Sat Jul 19 10:21:36 2003 +++ AccessSpecList.h.mod Sat Oct 18 17:25:05 2003 @@ -1,51 +1,65 @@ -/* -Intel Open Source License - -Copyright (c) 2001 Intel Corporation -All rights reserved. -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: - - Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimer. - - Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - - Neither the name of the Intel Corporation nor the names of its contributors - may be used to endorse or promote products derived from this software - without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ``AS IS'' -AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -ARE DISCLAIMED. IN NO EVENT SHALL THE INTEL OR ITS CONTRIBUTORS BE LIABLE -FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE -USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -*/ -// ========================================================================== -// Copyright (C) 1997-2000 Intel Corporation -// All rights reserved -// INTEL CORPORATION PROPRIETARY INFORMATION -// This software is supplied under the terms of a license agreement or -// nondisclosure agreement with Intel Corporation and may not be copied -// or disclosed except in accordance with the terms of that agreement. -// ========================================================================== -// -// AccessSpecList.h: Interface for the AccessSpecList class, which is -// in charge of keeping track of all the access specifications available to -// the user. -// -/////////////////////////////////////////////////////////////// - +/* ######################################################################### */ +/* ## ## */ +/* ## (Iometer) / AccessSpecList.h ## */ +/* ## ## */ +/* ## ------------------------------------------------------------------- ## */ +/* ## ## */ +/* ## Job .......: Interface for the AccessSpecList class, which is ## */ +/* ## in charge of keeping track of all the access ## */ +/* ## specifications available to the user. ## */ +/* ## ## */ +/* ## ------------------------------------------------------------------- ## */ +/* ## ## */ +/* ## Intel Open Source License ## */ +/* ## ## */ +/* ## Copyright (c) 2001 Intel Corporation ## */ +/* ## All rights reserved. ## */ +/* ## Redistribution and use in source and binary forms, with or ## */ +/* ## without modification, are permitted provided that the following ## */ +/* ## conditions are met: ## */ +/* ## ## */ +/* ## Redistributions of source code must retain the above copyright ## */ +/* ## notice, this list of conditions and the following disclaimer. ## */ +/* ## ## */ +/* ## Redistributions in binary form must reproduce the above copyright ## */ +/* ## notice, this list of conditions and the following disclaimer in ## */ +/* ## the documentation and/or other materials provided with the ## */ +/* ## distribution. ## */ +/* ## ## */ +/* ## Neither the name of the Intel Corporation nor the names of its ## */ +/* ## contributors may be used to endorse or promote products derived ## */ +/* ## from this software without specific prior written permission. ## */ +/* ## ## */ +/* ## THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND ## */ +/* ## CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, ## */ +/* ## INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF ## */ +/* ## MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE ## */ +/* ## DISCLAIMED. IN NO EVENT SHALL THE INTEL OR ITS CONTRIBUTORS BE ## */ +/* ## LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, ## */ +/* ## OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, ## */ +/* ## PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, ## */ +/* ## OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY ## */ +/* ## THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR ## */ +/* ## TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT ## */ +/* ## OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY ## */ +/* ## OF SUCH DAMAGE. ## */ +/* ## ## */ +/* ## ------------------------------------------------------------------- ## */ +/* ## ## */ +/* ## Remarks ...: ## */ +/* ## ## */ +/* ## ------------------------------------------------------------------- ## */ +/* ## ## */ +/* ## Changes ...: 2003-10-17 (daniel.scheibli@edelbyte.org) ## */ +/* ## - Moved to the use of the IOMTR_[OSFAMILY|OS|CPU]_* ## */ +/* ## global defines. ## */ +/* ## - Integrated the License Statement into this header. ## */ +/* ## - Added new header holding the changelog. ## */ +/* ## ## */ +/* ######################################################################### */ #ifndef ACCESS_LIST_DEFINED #define ACCESS_LIST_DEFINED + #include "IOAccess.h" #include "IOTest.h" --- BigMeter.cpp Sat Oct 18 19:09:31 2003 +++ BigMeter.cpp.mod Sat Oct 18 21:46:14 2003 @@ -4,7 +4,44 @@ /* ## ## */ /* ## ------------------------------------------------------------------- ## */ /* ## ## */ -/* ## Job .......: ... ## */ +/* ## Job .......: Implementation of the CBigMeter class, which is ## */ +/* ## responsible for the "Presentation Meter" dialog. ## */ +/* ## ## */ +/* ## ------------------------------------------------------------------- ## */ +/* ## ## */ +/* ## Intel Open Source License ## */ +/* ## ## */ +/* ## Copyright (c) 2001 Intel Corporation ## */ +/* ## All rights reserved. ## */ +/* ## Redistribution and use in source and binary forms, with or ## */ +/* ## without modification, are permitted provided that the following ## */ +/* ## conditions are met: ## */ +/* ## ## */ +/* ## Redistributions of source code must retain the above copyright ## */ +/* ## notice, this list of conditions and the following disclaimer. ## */ +/* ## ## */ +/* ## Redistributions in binary form must reproduce the above copyright ## */ +/* ## notice, this list of conditions and the following disclaimer in ## */ +/* ## the documentation and/or other materials provided with the ## */ +/* ## distribution. ## */ +/* ## ## */ +/* ## Neither the name of the Intel Corporation nor the names of its ## */ +/* ## contributors may be used to endorse or promote products derived ## */ +/* ## from this software without specific prior written permission. ## */ +/* ## ## */ +/* ## THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND ## */ +/* ## CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, ## */ +/* ## INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF ## */ +/* ## MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE ## */ +/* ## DISCLAIMED. IN NO EVENT SHALL THE INTEL OR ITS CONTRIBUTORS BE ## */ +/* ## LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, ## */ +/* ## OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, ## */ +/* ## PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, ## */ +/* ## OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY ## */ +/* ## THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR ## */ +/* ## TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT ## */ +/* ## OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY ## */ +/* ## OF SUCH DAMAGE. ## */ /* ## ## */ /* ## ------------------------------------------------------------------- ## */ /* ## ## */ @@ -12,56 +49,16 @@ /* ## ## */ /* ## ------------------------------------------------------------------- ## */ /* ## ## */ -/* ## Changes ...: 2003-04-25 (daniel.scheibli@edelbyte.org) ## */ +/* ## Changes ...: 2003-10-17 (daniel.scheibli@edelbyte.org) ## */ +/* ## - Moved to the use of the IOMTR_[OSFAMILY|OS|CPU]_* ## */ +/* ## global defines. ## */ +/* ## - Integrated the License Statement into this header. ## */ +/* ## 2003-04-25 (daniel.scheibli@edelbyte.org) ## */ /* ## - Updated the global debug flag (_DEBUG) handling ## */ /* ## of the source file (check for platform etc.). ## */ /* ## - Added new header holding the changelog. ## */ /* ## ## */ /* ######################################################################### */ -/* -Intel Open Source License - -Copyright (c) 2001 Intel Corporation -All rights reserved. -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: - - Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimer. - - Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - - Neither the name of the Intel Corporation nor the names of its contributors - may be used to endorse or promote products derived from this software - without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ``AS IS'' -AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -ARE DISCLAIMED. IN NO EVENT SHALL THE INTEL OR ITS CONTRIBUTORS BE LIABLE -FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE -USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -*/ -// ========================================================================== -// Copyright (C) 1997-2000 Intel Corporation -// All rights reserved -// INTEL CORPORATION PROPRIETARY INFORMATION -// This software is supplied under the terms of a license agreement or -// nondisclosure agreement with Intel Corporation and may not be copied -// or disclosed except in accordance with the terms of that agreement. -// ========================================================================== -// -// BigMeter.cpp: Implementation of the CBigMeter class, which is responsible -// for the "Presentation Meter" dialog. -// -////////////////////////////////////////////////////////////////////// #include "stdafx.h" @@ -81,12 +78,12 @@ // will be a MFC hacker who could advice here. // [1] = http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vclib/html/_mfc_debug_new.asp // -#if defined (_WIN32) || defined (_WIN64) -#ifdef _DEBUG -#define new DEBUG_NEW -#undef THIS_FILE -static char THIS_FILE[] = __FILE__; -#endif +#if defined(IOMTR_OS_WIN32) || defined(IOMTR_OS_WIN64) + #ifdef _DEBUG + #define new DEBUG_NEW + #undef THIS_FILE + static char THIS_FILE[] = __FILE__; + #endif #endif --- BigMeter.h Sat Jul 19 10:21:37 2003 +++ BigMeter.h.mod Sat Oct 18 18:15:08 2003 @@ -1,54 +1,68 @@ -/* -Intel Open Source License - -Copyright (c) 2001 Intel Corporation -All rights reserved. -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: - - Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimer. - - Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - - Neither the name of the Intel Corporation nor the names of its contributors - may be used to endorse or promote products derived from this software - without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ``AS IS'' -AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -ARE DISCLAIMED. IN NO EVENT SHALL THE INTEL OR ITS CONTRIBUTORS BE LIABLE -FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE -USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -*/ -// ========================================================================== -// Copyright (C) 1997-2000 Intel Corporation -// All rights reserved -// INTEL CORPORATION PROPRIETARY INFORMATION -// This software is supplied under the terms of a license agreement or -// nondisclosure agreement with Intel Corporation and may not be copied -// or disclosed except in accordance with the terms of that agreement. -// ========================================================================== -// -// BigMeter.h: Interface for the CBigMeter class, which is responsible -// for the "Presentation Meter" dialog. -// -////////////////////////////////////////////////////////////////////// - +/* ######################################################################### */ +/* ## ## */ +/* ## (Iometer) / BigMeter.h ## */ +/* ## ## */ +/* ## ------------------------------------------------------------------- ## */ +/* ## ## */ +/* ## Job .......: Interface for the CBigMeter class, which is ## */ +/* ## responsible for the "Presentation Meter" dialog. ## */ +/* ## ## */ +/* ## ------------------------------------------------------------------- ## */ +/* ## ## */ +/* ## Intel Open Source License ## */ +/* ## ## */ +/* ## Copyright (c) 2001 Intel Corporation ## */ +/* ## All rights reserved. ## */ +/* ## Redistribution and use in source and binary forms, with or ## */ +/* ## without modification, are permitted provided that the following ## */ +/* ## conditions are met: ## */ +/* ## ## */ +/* ## Redistributions of source code must retain the above copyright ## */ +/* ## notice, this list of conditions and the following disclaimer. ## */ +/* ## ## */ +/* ## Redistributions in binary form must reproduce the above copyright ## */ +/* ## notice, this list of conditions and the following disclaimer in ## */ +/* ## the documentation and/or other materials provided with the ## */ +/* ## distribution. ## */ +/* ## ## */ +/* ## Neither the name of the Intel Corporation nor the names of its ## */ +/* ## contributors may be used to endorse or promote products derived ## */ +/* ## from this software without specific prior written permission. ## */ +/* ## ## */ +/* ## THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND ## */ +/* ## CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, ## */ +/* ## INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF ## */ +/* ## MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE ## */ +/* ## DISCLAIMED. IN NO EVENT SHALL THE INTEL OR ITS CONTRIBUTORS BE ## */ +/* ## LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, ## */ +/* ## OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, ## */ +/* ## PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, ## */ +/* ## OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY ## */ +/* ## THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR ## */ +/* ## TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT ## */ +/* ## OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY ## */ +/* ## OF SUCH DAMAGE. ## */ +/* ## ## */ +/* ## ------------------------------------------------------------------- ## */ +/* ## ## */ +/* ## Remarks ...: ## */ +/* ## ## */ +/* ## ------------------------------------------------------------------- ## */ +/* ## ## */ +/* ## Changes ...: 2003-10-17 (daniel.scheibli@edelbyte.org) ## */ +/* ## - Moved to the use of the IOMTR_[OSFAMILY|OS|CPU]_* ## */ +/* ## global defines. ## */ +/* ## - Integrated the License Statement into this header. ## */ +/* ## - Added new header holding the changelog. ## */ +/* ## ## */ +/* ######################################################################### */ #ifndef BIGMETER_DEFINED #define BIGMETER_DEFINED -#define BUTTON_START 0x01 + +#define BUTTON_START 0x01 #define BUTTON_STOP 0x02 -#define BUTTON_STOPALL 0x04 +#define BUTTON_STOPALL 0x04 --- Dynamo.dsp Sun Jul 27 20:28:44 2003 +++ Dynamo.dsp.mod Sun Oct 19 00:04:34 2003 @@ -45,7 +45,7 @@ # ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "IOMTR_OSFAMILY_WINDOWS" /D "IOMTR_OS_WIN32" /D "IOMTR_CPU_I386" /D "_CONSOLE" /D "_MBCS" /YX /FD /c # ADD CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "IOMTR_OSFAMILY_WINDOWS" /D "IOMTR_OS_WIN32" /D "IOMTR_CPU_I386" /D "_CONSOLE" /D "_MBCS" /YX /FD /c # ADD BASE RSC /l 0x409 -# ADD RSC /l 0x409 /d "_PULSAR_" +# ADD RSC /l 0x409 /d "_PULSAR_" /D "IOMTR_OSFAMILY_WINDOWS" /D "IOMTR_OS_WIN32" /D "IOMTR_CPU_I386" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo @@ -71,7 +71,7 @@ # ADD CPP /nologo /MTd /W3 /Gm /GX /ZI /Od /D "WIN32" /D "IOMTR_OSFAMILY_WINDOWS" /D "IOMTR_OS_WIN32" /D "IOMTR_CPU_I386" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /FR /FD /GZ /c # SUBTRACT CPP /WX /YX # ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" /d "_PULSAR_" +# ADD RSC /l 0x409 /d "_DEBUG" /d "_PULSAR_" /D "IOMTR_OSFAMILY_WINDOWS" /D "IOMTR_OS_WIN32" /D "IOMTR_CPU_I386" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo --- Galileo.rc Sat Oct 18 23:27:51 2003 +++ Galileo.rc.mod Sat Oct 18 23:21:30 2003 @@ -1,34 +1,60 @@ -/* -Intel Open Source License - -Copyright (c) 2001 Intel Corporation -All rights reserved. -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: - - Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimer. - - Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - - Neither the name of the Intel Corporation nor the names of its contributors - may be used to endorse or promote products derived from this software - without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ``AS IS'' -AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -ARE DISCLAIMED. IN NO EVENT SHALL THE INTEL OR ITS CONTRIBUTORS BE LIABLE -FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE -USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -*/ +/* ######################################################################### */ +/* ## ## */ +/* ## Iometer / Galileo.rc ## */ +/* ## ## */ +/* ## ------------------------------------------------------------------- ## */ +/* ## ## */ +/* ## Job .......: ... ## */ +/* ## ## */ +/* ## ------------------------------------------------------------------- ## */ +/* ## ## */ +/* ## Intel Open Source License ## */ +/* ## ## */ +/* ## Copyright (c) 2001 Intel Corporation ## */ +/* ## All rights reserved. ## */ +/* ## Redistribution and use in source and binary forms, with or ## */ +/* ## without modification, are permitted provided that the following ## */ +/* ## conditions are met: ## */ +/* ## ## */ +/* ## Redistributions of source code must retain the above copyright ## */ +/* ## notice, this list of conditions and the following disclaimer. ## */ +/* ## ## */ +/* ## Redistributions in binary form must reproduce the above copyright ## */ +/* ## notice, this list of conditions and the following disclaimer in ## */ +/* ## the documentation and/or other materials provided with the ## */ +/* ## distribution. ## */ +/* ## ## */ +/* ## Neither the name of the Intel Corporation nor the names of its ## */ +/* ## contributors may be used to endorse or promote products derived ## */ +/* ## from this software without specific prior written permission. ## */ +/* ## ## */ +/* ## THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND ## */ +/* ## CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, ## */ +/* ## INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF ## */ +/* ## MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE ## */ +/* ## DISCLAIMED. IN NO EVENT SHALL THE INTEL OR ITS CONTRIBUTORS BE ## */ +/* ## LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, ## */ +/* ## OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, ## */ +/* ## PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, ## */ +/* ## OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY ## */ +/* ## THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR ## */ +/* ## TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT ## */ +/* ## OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY ## */ +/* ## OF SUCH DAMAGE. ## */ +/* ## ## */ +/* ## ------------------------------------------------------------------- ## */ +/* ## ## */ +/* ## Remarks ...: ## */ +/* ## ## */ +/* ## ------------------------------------------------------------------- ## */ +/* ## ## */ +/* ## Changes ...: 2003-10-17 (daniel.scheibli@edelbyte.org) ## */ +/* ## - Moved to the use of the IOMTR_[OSFAMILY|OS|CPU]_* ## */ +/* ## global defines. ## */ +/* ## - Integrated the License Statement into this header. ## */ +/* ## - Added new header holding the changelog. ## */ +/* ## ## */ +/* ######################################################################### */ //Microsoft Developer Studio generated resource script. // #include "resource.h" @@ -47,7 +73,7 @@ // English (U.S.) resources #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) -#if defined (_WIN32) || defined (_WIN64) +#if defined(IOMTR_OS_WIN32) || defined(IOMTR_OS_WIN64) LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US #pragma code_page(1252) #endif //_WIN32 || _WIN64 @@ -77,7 +103,7 @@ "#define _AFX_NO_PROPERTY_RESOURCES\r\n" "\r\n" "#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)\r\n" - "#if defined (_WIN32) || defined (_WIN64)\r\n" + "#if defined(IOMTR_OS_WIN32) || defined(IOMTR_OS_WIN64)\r\n" "LANGUAGE 9, 1\r\n" "#pragma code_page(1252)\r\n" "#endif\r\n" @@ -1099,7 +1125,7 @@ #define _AFX_NO_PROPERTY_RESOURCES #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) -#if defined (_WIN32) || defined (_WIN64) +#if defined(IOMTR_OS_WIN32) || defined(IOMTR_OS_WIN64) LANGUAGE 9, 1 #pragma code_page(1252) #endif --- GalileoCmdLine.cpp Sat Jul 19 10:21:42 2003 +++ GalileoCmdLine.cpp.mod Sat Oct 18 21:49:01 2003 @@ -4,7 +4,44 @@ /* ## ## */ /* ## ------------------------------------------------------------------- ## */ /* ## ## */ -/* ## Job .......: ... ## */ +/* ## Job .......: Implementation of the CGalileoCmdLine class, which ## */ +/* ## parses Iometer's command line. ## */ +/* ## ## */ +/* ## ------------------------------------------------------------------- ## */ +/* ## ## */ +/* ## Intel Open Source License ## */ +/* ## ## */ +/* ## Copyright (c) 2001 Intel Corporation ## */ +/* ## All rights reserved. ## */ +/* ## Redistribution and use in source and binary forms, with or ## */ +/* ## without modification, are permitted provided that the following ## */ +/* ## conditions are met: ## */ +/* ## ## */ +/* ## Redistributions of source code must retain the above copyright ## */ +/* ## notice, this list of conditions and the following disclaimer. ## */ +/* ## ## */ +/* ## Redistributions in binary form must reproduce the above copyright ## */ +/* ## notice, this list of conditions and the following disclaimer in ## */ +/* ## the documentation and/or other materials provided with the ## */ +/* ## distribution. ## */ +/* ## ## */ +/* ## Neither the name of the Intel Corporation nor the names of its ## */ +/* ## contributors may be used to endorse or promote products derived ## */ +/* ## from this software without specific prior written permission. ## */ +/* ## ## */ +/* ## THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND ## */ +/* ## CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, ## */ +/* ## INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF ## */ +/* ## MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE ## */ +/* ## DISCLAIMED. IN NO EVENT SHALL THE INTEL OR ITS CONTRIBUTORS BE ## */ +/* ## LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, ## */ +/* ## OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, ## */ +/* ## PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, ## */ +/* ## OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY ## */ +/* ## THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR ## */ +/* ## TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT ## */ +/* ## OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY ## */ +/* ## OF SUCH DAMAGE. ## */ /* ## ## */ /* ## ------------------------------------------------------------------- ## */ /* ## ## */ @@ -12,57 +49,16 @@ /* ## ## */ /* ## ------------------------------------------------------------------- ## */ /* ## ## */ -/* ## Changes ...: 2003-04-25 (daniel.scheibli@edelbyte.org) ## */ +/* ## Changes ...: 2003-10-17 (daniel.scheibli@edelbyte.org) ## */ +/* ## - Moved to the use of the IOMTR_[OSFAMILY|OS|CPU]_* ## */ +/* ## global defines. ## */ +/* ## - Integrated the License Statement into this header. ## */ +/* ## 2003-04-25 (daniel.scheibli@edelbyte.org) ## */ /* ## - Updated the global debug flag (_DEBUG) handling ## */ /* ## of the source file (check for platform etc.). ## */ /* ## - Added new header holding the changelog. ## */ /* ## ## */ /* ######################################################################### */ -/* -Intel Open Source License - -Copyright (c) 2001 Intel Corporation -All rights reserved. -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: - - Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimer. - - Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - - Neither the name of the Intel Corporation nor the names of its contributors - may be used to endorse or promote products derived from this software - without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ``AS IS'' -AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -ARE DISCLAIMED. IN NO EVENT SHALL THE INTEL OR ITS CONTRIBUTORS BE LIABLE -FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE -USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -*/ -// ========================================================================== -// Copyright (C) 1997-2000 Intel Corporation -// All rights reserved -// INTEL CORPORATION PROPRIETARY INFORMATION -// This software is supplied under the terms of a license agreement or -// nondisclosure agreement with Intel Corporation and may not be copied -// or disclosed except in accordance with the terms of that agreement. -// ========================================================================== -// -// GalileoCmdLine.cpp: Implementation of the CGalileoCmdLine class, which -// parses Iometer's command line. -// -////////////////////////////////////////////////////////////////////// -/* ######################################################################### */ #include "stdafx.h" @@ -79,12 +75,12 @@ // will be a MFC hacker who could advice here. // [1] = http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vclib/html/_mfc_debug_new.asp // -#if defined (_WIN32) || defined (_WIN64) -#ifdef _DEBUG -#define new DEBUG_NEW -#undef THIS_FILE -static char THIS_FILE[] = __FILE__; -#endif +#if defined(IOMTR_OS_WIN32) || defined(IOMTR_OS_WIN64) + #ifdef _DEBUG + #define new DEBUG_NEW + #undef THIS_FILE + static char THIS_FILE[] = __FILE__; + #endif #endif --- GalileoCmdLine.h Sat Jul 19 10:21:42 2003 +++ GalileoCmdLine.h.mod Sat Oct 18 18:18:36 2003 @@ -1,48 +1,61 @@ -/* -Intel Open Source License - -Copyright (c) 2001 Intel Corporation -All rights reserved. -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: - - Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimer. - - Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - - Neither the name of the Intel Corporation nor the names of its contributors - may be used to endorse or promote products derived from this software - without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ``AS IS'' -AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -ARE DISCLAIMED. IN NO EVENT SHALL THE INTEL OR ITS CONTRIBUTORS BE LIABLE -FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE -USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -*/ -// ========================================================================== -// Copyright (C) 1997-2000 Intel Corporation -// All rights reserved -// INTEL CORPORATION PROPRIETARY INFORMATION -// This software is supplied under the terms of a license agreement or -// nondisclosure agreement with Intel Corporation and may not be copied -// or disclosed except in accordance with the terms of that agreement. -// ========================================================================== -// -// GalileoCmdLine.h: Interface for the CGalileoCmdLine class, which -// parses Iometer's command line. -// -////////////////////////////////////////////////////////////////////// - +/* ######################################################################### */ +/* ## ## */ +/* ## (Iometer) / GalileoCmdLine.h ## */ +/* ## ## */ +/* ## ------------------------------------------------------------------- ## */ +/* ## ## */ +/* ## Job .......: Interface for the CGalileoCmdLine class, which ## */ +/* ## parses Iometer's command line. ## */ +/* ## ## */ +/* ## ------------------------------------------------------------------- ## */ +/* ## ## */ +/* ## Intel Open Source License ## */ +/* ## ## */ +/* ## Copyright (c) 2001 Intel Corporation ## */ +/* ## All rights reserved. ## */ +/* ## Redistribution and use in source and binary forms, with or ## */ +/* ## without modification, are permitted provided that the following ## */ +/* ## conditions are met: ## */ +/* ## ## */ +/* ## Redistributions of source code must retain the above copyright ## */ +/* ## notice, this list of conditions and the following disclaimer. ## */ +/* ## ## */ +/* ## Redistributions in binary form must reproduce the above copyright ## */ +/* ## notice, this list of conditions and the following disclaimer in ## */ +/* ## the documentation and/or other materials provided with the ## */ +/* ## distribution. ## */ +/* ## ## */ +/* ## Neither the name of the Intel Corporation nor the names of its ## */ +/* ## contributors may be used to endorse or promote products derived ## */ +/* ## from this software without specific prior written permission. ## */ +/* ## ## */ +/* ## THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND ## */ +/* ## CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, ## */ +/* ## INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF ## */ +/* ## MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE ## */ +/* ## DISCLAIMED. IN NO EVENT SHALL THE INTEL OR ITS CONTRIBUTORS BE ## */ +/* ## LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, ## */ +/* ## OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, ## */ +/* ## PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, ## */ +/* ## OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY ## */ +/* ## THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR ## */ +/* ## TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT ## */ +/* ## OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY ## */ +/* ## OF SUCH DAMAGE. ## */ +/* ## ## */ +/* ## ------------------------------------------------------------------- ## */ +/* ## ## */ +/* ## Remarks ...: ## */ +/* ## ## */ +/* ## ------------------------------------------------------------------- ## */ +/* ## ## */ +/* ## Changes ...: 2003-10-17 (daniel.scheibli@edelbyte.org) ## */ +/* ## - Moved to the use of the IOMTR_[OSFAMILY|OS|CPU]_* ## */ +/* ## global defines. ## */ +/* ## - Integrated the License Statement into this header. ## */ +/* ## - Added new header holding the changelog. ## */ +/* ## ## */ +/* ######################################################################### */ #ifndef GALILEO_CMD_LINE_INCLUDED #define GALILEO_CMD_LINE_INCLUDED --- GalileoDefs.h Sat Jul 19 10:21:42 2003 +++ GalileoDefs.h.mod Sat Oct 18 18:25:02 2003 @@ -1,52 +1,64 @@ -/* -Intel Open Source License - -Copyright (c) 2001 Intel Corporation -All rights reserved. -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: - - Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimer. - - Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - - Neither the name of the Intel Corporation nor the names of its contributors - may be used to endorse or promote products derived from this software - without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ``AS IS'' -AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -ARE DISCLAIMED. IN NO EVENT SHALL THE INTEL OR ITS CONTRIBUTORS BE LIABLE -FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE -USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -*/ -// ========================================================================== -// Copyright (C) 1999-2000 Intel Corporation -// All rights reserved -// INTEL CORPORATION PROPRIETARY INFORMATION -// This software is supplied under the terms of a license agreement or -// nondisclosure agreement with Intel Corporation and may not be copied -// or disclosed except in accordance with the terms of that agreement. -// ========================================================================== -// -// This is one of the CENTRAL PROJECT FILES for Iometer -// GalileoDefs.h - GUI-wide central include file -// GalileoGlobals.cpp - global function implementation file -// -////////////////////////////////////////////////////////////////////// - - +/* ######################################################################### */ +/* ## ## */ +/* ## (Iometer) / GalileoDefs.h ## */ +/* ## ## */ +/* ## ------------------------------------------------------------------- ## */ +/* ## ## */ +/* ## Job .......: This is one of the CENTRAL PROJECT FILES for ## */ +/* ## Iometer. It holds GUI-wide central include file. ## */ +/* ## ## */ +/* ## ------------------------------------------------------------------- ## */ +/* ## ## */ +/* ## Intel Open Source License ## */ +/* ## ## */ +/* ## Copyright (c) 2001 Intel Corporation ## */ +/* ## All rights reserved. ## */ +/* ## Redistribution and use in source and binary forms, with or ## */ +/* ## without modification, are permitted provided that the following ## */ +/* ## conditions are met: ## */ +/* ## ## */ +/* ## Redistributions of source code must retain the above copyright ## */ +/* ## notice, this list of conditions and the following disclaimer. ## */ +/* ## ## */ +/* ## Redistributions in binary form must reproduce the above copyright ## */ +/* ## notice, this list of conditions and the following disclaimer in ## */ +/* ## the documentation and/or other materials provided with the ## */ +/* ## distribution. ## */ +/* ## ## */ +/* ## Neither the name of the Intel Corporation nor the names of its ## */ +/* ## contributors may be used to endorse or promote products derived ## */ +/* ## from this software without specific prior written permission. ## */ +/* ## ## */ +/* ## THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND ## */ +/* ## CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, ## */ +/* ## INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF ## */ +/* ## MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE ## */ +/* ## DISCLAIMED. IN NO EVENT SHALL THE INTEL OR ITS CONTRIBUTORS BE ## */ +/* ## LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, ## */ +/* ## OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, ## */ +/* ## PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, ## */ +/* ## OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY ## */ +/* ## THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR ## */ +/* ## TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT ## */ +/* ## OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY ## */ +/* ## OF SUCH DAMAGE. ## */ +/* ## ## */ +/* ## ------------------------------------------------------------------- ## */ +/* ## ## */ +/* ## Remarks ...: ## */ +/* ## ## */ +/* ## ------------------------------------------------------------------- ## */ +/* ## ## */ +/* ## Changes ...: 2003-10-17 (daniel.scheibli@edelbyte.org) ## */ +/* ## - Moved to the use of the IOMTR_[OSFAMILY|OS|CPU]_* ## */ +/* ## global defines. ## */ +/* ## - Integrated the License Statement into this header. ## */ +/* ## - Added new header holding the changelog. ## */ +/* ## ## */ +/* ######################################################################### */ #ifndef GALILEODEFS_DEFINED #define GALILEODEFS_DEFINED + #include "stdafx.h" #include "resource.h" --- GalileoDoc.cpp Sat Jul 19 10:21:42 2003 +++ GalileoDoc.cpp.mod Sat Oct 18 17:28:20 2003 @@ -4,7 +4,44 @@ /* ## ## */ /* ## ------------------------------------------------------------------- ## */ /* ## ## */ -/* ## Job .......: ... ## */ +/* ## Job .......: Implementation of the CGalileoDoc class. This class ## */ +/* ## contains almost nothing but AppWizard-generated code. ## */ +/* ## ## */ +/* ## ------------------------------------------------------------------- ## */ +/* ## ## */ +/* ## Intel Open Source License ## */ +/* ## ## */ +/* ## Copyright (c) 2001 Intel Corporation ## */ +/* ## All rights reserved. ## */ +/* ## Redistribution and use in source and binary forms, with or ## */ +/* ## without modification, are permitted provided that the following ## */ +/* ## conditions are met: ## */ +/* ## ## */ +/* ## Redistributions of source code must retain the above copyright ## */ +/* ## notice, this list of conditions and the following disclaimer. ## */ +/* ## ## */ +/* ## Redistributions in binary form must reproduce the above copyright ## */ +/* ## notice, this list of conditions and the following disclaimer in ## */ +/* ## the documentation and/or other materials provided with the ## */ +/* ## distribution. ## */ +/* ## ## */ +/* ## Neither the name of the Intel Corporation nor the names of its ## */ +/* ## contributors may be used to endorse or promote products derived ## */ +/* ## from this software without specific prior written permission. ## */ +/* ## ## */ +/* ## THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND ## */ +/* ## CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, ## */ +/* ## INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF ## */ +/* ## MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE ## */ +/* ## DISCLAIMED. IN NO EVENT SHALL THE INTEL OR ITS CONTRIBUTORS BE ## */ +/* ## LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, ## */ +/* ## OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, ## */ +/* ## PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, ## */ +/* ## OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY ## */ +/* ## THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR ## */ +/* ## TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT ## */ +/* ## OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY ## */ +/* ## OF SUCH DAMAGE. ## */ /* ## ## */ /* ## ------------------------------------------------------------------- ## */ /* ## ## */ @@ -12,57 +49,16 @@ /* ## ## */ /* ## ------------------------------------------------------------------- ## */ /* ## ## */ -/* ## Changes ...: 2003-04-25 (daniel.scheibli@edelbyte.org) ## */ +/* ## Changes ...: 2003-10-17 (daniel.scheibli@edelbyte.org) ## */ +/* ## - Moved to the use of the IOMTR_[OSFAMILY|OS|CPU]_* ## */ +/* ## global defines. ## */ +/* ## - Integrated the License Statement into this header. ## */ +/* ## 2003-04-25 (daniel.scheibli@edelbyte.org) ## */ /* ## - Updated the global debug flag (_DEBUG) handling ## */ /* ## of the source file (check for platform etc.). ## */ /* ## - Added new header holding the changelog. ## */ /* ## ## */ /* ######################################################################### */ -/* -Intel Open Source License - -Copyright (c) 2001 Intel Corporation -All rights reserved. -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: - - Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimer. - - Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - - Neither the name of the Intel Corporation nor the names of its contributors - may be used to endorse or promote products derived from this software - without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ``AS IS'' -AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -ARE DISCLAIMED. IN NO EVENT SHALL THE INTEL OR ITS CONTRIBUTORS BE LIABLE -FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE -USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -*/ -// ========================================================================== -// Copyright (C) 1997-2000 Intel Corporation -// All rights reserved -// INTEL CORPORATION PROPRIETARY INFORMATION -// This software is supplied under the terms of a license agreement or -// nondisclosure agreement with Intel Corporation and may not be copied -// or disclosed except in accordance with the terms of that agreement. -// ========================================================================== -// -// GalileoDoc.cpp: Implementation of the CGalileoDoc class. This class -// contains almost nothing but AppWizard-generated code. -// -////////////////////////////////////////////////////////////////////// -/* ######################################################################### */ #include "stdafx.h" @@ -78,13 +74,14 @@ // will be a MFC hacker who could advice here. // [1] = http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vclib/html/_mfc_debug_new.asp // -#if defined (_WIN32) || defined (_WIN64) -#ifdef _DEBUG -#define new DEBUG_NEW -#undef THIS_FILE -static char THIS_FILE[] = __FILE__; -#endif +#if defined(IOMTR_OS_WIN32) || defined(IOMTR_OS_WIN64) + #ifdef _DEBUG + #define new DEBUG_NEW + #undef THIS_FILE + static char THIS_FILE[] = __FILE__; + #endif #endif + ///////////////////////////////////////////////////////////////////////////// --- GalileoDoc.h Sat Jul 19 10:21:42 2003 +++ GalileoDoc.h.mod Sat Oct 18 17:31:08 2003 @@ -1,48 +1,61 @@ -/* -Intel Open Source License - -Copyright (c) 2001 Intel Corporation -All rights reserved. -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: - - Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimer. - - Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - - Neither the name of the Intel Corporation nor the names of its contributors - may be used to endorse or promote products derived from this software - without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ``AS IS'' -AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -ARE DISCLAIMED. IN NO EVENT SHALL THE INTEL OR ITS CONTRIBUTORS BE LIABLE -FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE -USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -*/ -// ========================================================================== -// Copyright (C) 1997-2000 Intel Corporation -// All rights reserved -// INTEL CORPORATION PROPRIETARY INFORMATION -// This software is supplied under the terms of a license agreement or -// nondisclosure agreement with Intel Corporation and may not be copied -// or disclosed except in accordance with the terms of that agreement. -// ========================================================================== -// -// GalileoDoc.h: Interface for the CGalileoDoc class. This class -// contains almost nothing but AppWizard-generated code. -// -////////////////////////////////////////////////////////////////////// - +/* ######################################################################### */ +/* ## ## */ +/* ## (Iometer) / GalileoDoc.h ## */ +/* ## ## */ +/* ## ------------------------------------------------------------------- ## */ +/* ## ## */ +/* ## Job .......: Interface for the CGalileoDoc class. This class ## */ +/* ## contains almost nothing but AppWizard-generated code. ## */ +/* ## ## */ +/* ## ------------------------------------------------------------------- ## */ +/* ## ## */ +/* ## Intel Open Source License ## */ +/* ## ## */ +/* ## Copyright (c) 2001 Intel Corporation ## */ +/* ## All rights reserved. ## */ +/* ## Redistribution and use in source and binary forms, with or ## */ +/* ## without modification, are permitted provided that the following ## */ +/* ## conditions are met: ## */ +/* ## ## */ +/* ## Redistributions of source code must retain the above copyright ## */ +/* ## notice, this list of conditions and the following disclaimer. ## */ +/* ## ## */ +/* ## Redistributions in binary form must reproduce the above copyright ## */ +/* ## notice, this list of conditions and the following disclaimer in ## */ +/* ## the documentation and/or other materials provided with the ## */ +/* ## distribution. ## */ +/* ## ## */ +/* ## Neither the name of the Intel Corporation nor the names of its ## */ +/* ## contributors may be used to endorse or promote products derived ## */ +/* ## from this software without specific prior written permission. ## */ +/* ## ## */ +/* ## THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND ## */ +/* ## CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, ## */ +/* ## INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF ## */ +/* ## MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE ## */ +/* ## DISCLAIMED. IN NO EVENT SHALL THE INTEL OR ITS CONTRIBUTORS BE ## */ +/* ## LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, ## */ +/* ## OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, ## */ +/* ## PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, ## */ +/* ## OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY ## */ +/* ## THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR ## */ +/* ## TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT ## */ +/* ## OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY ## */ +/* ## OF SUCH DAMAGE. ## */ +/* ## ## */ +/* ## ------------------------------------------------------------------- ## */ +/* ## ## */ +/* ## Remarks ...: ## */ +/* ## ## */ +/* ## ------------------------------------------------------------------- ## */ +/* ## ## */ +/* ## Changes ...: 2003-10-17 (daniel.scheibli@edelbyte.org) ## */ +/* ## - Moved to the use of the IOMTR_[OSFAMILY|OS|CPU]_* ## */ +/* ## global defines. ## */ +/* ## - Integrated the License Statement into this header. ## */ +/* ## - Added new header holding the changelog. ## */ +/* ## ## */ +/* ######################################################################### */ #ifndef DOC_DEFINED #define DOC_DEFINED --- GalileoGlobals.cpp Sat Oct 18 23:17:44 2003 +++ GalileoGlobals.cpp.mod Sat Oct 18 23:23:12 2003 @@ -48,7 +48,10 @@ /* ## ## */ /* ## ------------------------------------------------------------------- ## */ /* ## ## */ -/* ## Changes ...: 2003-10-05 (daniel.scheibli@edelbyte.org) ## */ +/* ## Changes ...: 2003-10-17 (daniel.scheibli@edelbyte.org) ## */ +/* ## - Moved to the use of the IOMTR_[OSFAMILY|OS|CPU]_* ## */ +/* ## global defines. ## */ +/* ## 2003-10-05 (daniel.scheibli@edelbyte.org) ## */ /* ## - Integrated the modification contributed by ## */ /* ## Vedran Degoricija, to get the code compile with ## */ /* ## the Windows 64 Bit on AMD64. ## */ @@ -82,7 +85,7 @@ // will be a MFC hacker who could advice here. // [1] = http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vclib/html/_mfc_debug_new.asp // -#if defined (_WIN32) || defined (_WIN64) +#if defined(IOMTR_OS_WIN32) || defined(IOMTR_OS_WIN64) #ifdef _DEBUG #define new DEBUG_NEW #undef THIS_FILE --- GalileoView.cpp Sat Jul 19 10:21:47 2003 +++ GalileoView.cpp.mod Sat Oct 18 17:34:12 2003 @@ -4,7 +4,44 @@ /* ## ## */ /* ## ------------------------------------------------------------------- ## */ /* ## ## */ -/* ## Job .......: ... ## */ +/* ## Job .......: Implementation of the CGalileoView class, which ## */ +/* ## manages Iometer's overall GUI (e.g. toolbar). ## */ +/* ## ## */ +/* ## ------------------------------------------------------------------- ## */ +/* ## ## */ +/* ## Intel Open Source License ## */ +/* ## ## */ +/* ## Copyright (c) 2001 Intel Corporation ## */ +/* ## All rights reserved. ## */ +/* ## Redistribution and use in source and binary forms, with or ## */ +/* ## without modification, are permitted provided that the following ## */ +/* ## conditions are met: ## */ +/* ## ## */ +/* ## Redistributions of source code must retain the above copyright ## */ +/* ## notice, this list of conditions and the following disclaimer. ## */ +/* ## ## */ +/* ## Redistributions in binary form must reproduce the above copyright ## */ +/* ## notice, this list of conditions and the following disclaimer in ## */ +/* ## the documentation and/or other materials provided with the ## */ +/* ## distribution. ## */ +/* ## ## */ +/* ## Neither the name of the Intel Corporation nor the names of its ## */ +/* ## contributors may be used to endorse or promote products derived ## */ +/* ## from this software without specific prior written permission. ## */ +/* ## ## */ +/* ## THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND ## */ +/* ## CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, ## */ +/* ## INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF ## */ +/* ## MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE ## */ +/* ## DISCLAIMED. IN NO EVENT SHALL THE INTEL OR ITS CONTRIBUTORS BE ## */ +/* ## LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, ## */ +/* ## OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, ## */ +/* ## PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, ## */ +/* ## OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY ## */ +/* ## THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR ## */ +/* ## TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT ## */ +/* ## OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY ## */ +/* ## OF SUCH DAMAGE. ## */ /* ## ## */ /* ## ------------------------------------------------------------------- ## */ /* ## ## */ @@ -12,57 +49,16 @@ /* ## ## */ /* ## ------------------------------------------------------------------- ## */ /* ## ## */ -/* ## Changes ...: 2003-04-25 (daniel.scheibli@edelbyte.org) ## */ +/* ## Changes ...: 2003-10-17 (daniel.scheibli@edelbyte.org) ## */ +/* ## - Moved to the use of the IOMTR_[OSFAMILY|OS|CPU]_* ## */ +/* ## global defines. ## */ +/* ## - Integrated the License Statement into this header. ## */ +/* ## 2003-04-25 (daniel.scheibli@edelbyte.org) ## */ /* ## - Updated the global debug flag (_DEBUG) handling ## */ /* ## of the source file (check for platform etc.). ## */ /* ## - Added new header holding the changelog. ## */ /* ## ## */ /* ######################################################################### */ -/* -Intel Open Source License - -Copyright (c) 2001 Intel Corporation -All rights reserved. -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: - - Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimer. - - Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - - Neither the name of the Intel Corporation nor the names of its contributors - may be used to endorse or promote products derived from this software - without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ``AS IS'' -AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -ARE DISCLAIMED. IN NO EVENT SHALL THE INTEL OR ITS CONTRIBUTORS BE LIABLE -FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE -USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -*/ -// ========================================================================== -// Copyright (C) 1997-2000 Intel Corporation -// All rights reserved -// INTEL CORPORATION PROPRIETARY INFORMATION -// This software is supplied under the terms of a license agreement or -// nondisclosure agreement with Intel Corporation and may not be copied -// or disclosed except in accordance with the terms of that agreement. -// ========================================================================== -// -// GalileoView.cpp: Implementation of the CGalileoView class, which manages -// Iometer's overall GUI (e.g. toolbar). -// -////////////////////////////////////////////////////////////////////// -/* ######################################################################### */ #include "stdafx.h" @@ -80,12 +76,12 @@ // will be a MFC hacker who could advice here. // [1] = http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vclib/html/_mfc_debug_new.asp // -#if defined (_WIN32) || defined (_WIN64) -#ifdef _DEBUG -#define new DEBUG_NEW -#undef THIS_FILE -static char THIS_FILE[] = __FILE__; -#endif +#if defined(IOMTR_OS_WIN32) || defined(IOMTR_OS_WIN64) + #ifdef _DEBUG + #define new DEBUG_NEW + #undef THIS_FILE + static char THIS_FILE[] = __FILE__; + #endif #endif --- GalileoView.h Sat Jul 19 10:21:47 2003 +++ GalileoView.h.mod Sat Oct 18 17:40:54 2003 @@ -1,60 +1,74 @@ -/* -Intel Open Source License - -Copyright (c) 2001 Intel Corporation -All rights reserved. -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: - - Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimer. - - Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - - Neither the name of the Intel Corporation nor the names of its contributors - may be used to endorse or promote products derived from this software - without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ``AS IS'' -AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -ARE DISCLAIMED. IN NO EVENT SHALL THE INTEL OR ITS CONTRIBUTORS BE LIABLE -FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE -USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -*/ -// ========================================================================== -// Copyright (C) 1997-2000 Intel Corporation -// All rights reserved -// INTEL CORPORATION PROPRIETARY INFORMATION -// This software is supplied under the terms of a license agreement or -// nondisclosure agreement with Intel Corporation and may not be copied -// or disclosed except in accordance with the terms of that agreement. -// ========================================================================== -// -// GalileoView.h: Interface for the CGalileoView class, which manages -// Iometer's overall GUI (e.g. toolbar). -// -////////////////////////////////////////////////////////////////////// - +/* ######################################################################### */ +/* ## ## */ +/* ## (Iometer) / GalileoView.h ## */ +/* ## ## */ +/* ## ------------------------------------------------------------------- ## */ +/* ## ## */ +/* ## Job .......: Interface for the CGalileoView class, which manages ## */ +/* ## Iometer's overall GUI (e.g. toolbar). ## */ +/* ## ## */ +/* ## ------------------------------------------------------------------- ## */ +/* ## ## */ +/* ## Intel Open Source License ## */ +/* ## ## */ +/* ## Copyright (c) 2001 Intel Corporation ## */ +/* ## All rights reserved. ## */ +/* ## Redistribution and use in source and binary forms, with or ## */ +/* ## without modification, are permitted provided that the following ## */ +/* ## conditions are met: ## */ +/* ## ## */ +/* ## Redistributions of source code must retain the above copyright ## */ +/* ## notice, this list of conditions and the following disclaimer. ## */ +/* ## ## */ +/* ## Redistributions in binary form must reproduce the above copyright ## */ +/* ## notice, this list of conditions and the following disclaimer in ## */ +/* ## the documentation and/or other materials provided with the ## */ +/* ## distribution. ## */ +/* ## ## */ +/* ## Neither the name of the Intel Corporation nor the names of its ## */ +/* ## contributors may be used to endorse or promote products derived ## */ +/* ## from this software without specific prior written permission. ## */ +/* ## ## */ +/* ## THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND ## */ +/* ## CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, ## */ +/* ## INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF ## */ +/* ## MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE ## */ +/* ## DISCLAIMED. IN NO EVENT SHALL THE INTEL OR ITS CONTRIBUTORS BE ## */ +/* ## LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, ## */ +/* ## OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, ## */ +/* ## PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, ## */ +/* ## OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY ## */ +/* ## THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR ## */ +/* ## TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT ## */ +/* ## OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY ## */ +/* ## OF SUCH DAMAGE. ## */ +/* ## ## */ +/* ## ------------------------------------------------------------------- ## */ +/* ## ## */ +/* ## Remarks ...: ## */ +/* ## ## */ +/* ## ------------------------------------------------------------------- ## */ +/* ## ## */ +/* ## Changes ...: 2003-10-17 (daniel.scheibli@edelbyte.org) ## */ +/* ## - Moved to the use of the IOMTR_[OSFAMILY|OS|CPU]_* ## */ +/* ## global defines. ## */ +/* ## - Integrated the License Statement into this header. ## */ +/* ## - Added new header holding the changelog. ## */ +/* ## ## */ +/* ######################################################################### */ #ifndef VIEW_DEFINED #define VIEW_DEFINED + #define TEST_TIMER 1 -#define PREPARE_TIMER 2 +#define PREPARE_TIMER 2 #define RAMP_TIMER 3 #define IDLE_TIMER 4 #define DISK_PAGE 0 -#define NETWORK_PAGE 1 +#define NETWORK_PAGE 1 #define ACCESS_PAGE 2 -#define DISPLAY_PAGE 3 +#define DISPLAY_PAGE 3 #define SETUP_PAGE 4 #define NUM_TOOLBAR_BUTTONS 13 --- ICFOpenDialog.cpp Sat Jul 19 10:21:47 2003 +++ ICFOpenDialog.cpp.mod Sat Oct 18 21:54:37 2003 @@ -4,7 +4,46 @@ /* ## ## */ /* ## ------------------------------------------------------------------- ## */ /* ## ## */ -/* ## Job .......: ... ## */ +/* ## Job .......: Implementation of the CICFOpenDialog class, which ## */ +/* ## extends the standard CFileDialog class with ## */ +/* ## additional functionality for opening Iometer's .ICF ## */ +/* ## (Iometer Configuration File) files. ## */ +/* ## ## */ +/* ## ------------------------------------------------------------------- ## */ +/* ## ## */ +/* ## Intel Open Source License ## */ +/* ## ## */ +/* ## Copyright (c) 2001 Intel Corporation ## */ +/* ## All rights reserved. ## */ +/* ## Redistribution and use in source and binary forms, with or ## */ +/* ## without modification, are permitted provided that the following ## */ +/* ## conditions are met: ## */ +/* ## ## */ +/* ## Redistributions of source code must retain the above copyright ## */ +/* ## notice, this list of conditions and the following disclaimer. ## */ +/* ## ## */ +/* ## Redistributions in binary form must reproduce the above copyright ## */ +/* ## notice, this list of conditions and the following disclaimer in ## */ +/* ## the documentation and/or other materials provided with the ## */ +/* ## distribution. ## */ +/* ## ## */ +/* ## Neither the name of the Intel Corporation nor the names of its ## */ +/* ## contributors may be used to endorse or promote products derived ## */ +/* ## from this software without specific prior written permission. ## */ +/* ## ## */ +/* ## THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND ## */ +/* ## CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, ## */ +/* ## INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF ## */ +/* ## MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE ## */ +/* ## DISCLAIMED. IN NO EVENT SHALL THE INTEL OR ITS CONTRIBUTORS BE ## */ +/* ## LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, ## */ +/* ## OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, ## */ +/* ## PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, ## */ +/* ## OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY ## */ +/* ## THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR ## */ +/* ## TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT ## */ +/* ## OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY ## */ +/* ## OF SUCH DAMAGE. ## */ /* ## ## */ /* ## ------------------------------------------------------------------- ## */ /* ## ## */ @@ -12,58 +51,16 @@ /* ## ## */ /* ## ------------------------------------------------------------------- ## */ /* ## ## */ -/* ## Changes ...: 2003-04-25 (daniel.scheibli@edelbyte.org) ## */ +/* ## Changes ...: 2003-10-17 (daniel.scheibli@edelbyte.org) ## */ +/* ## - Moved to the use of the IOMTR_[OSFAMILY|OS|CPU]_* ## */ +/* ## global defines. ## */ +/* ## - Integrated the License Statement into this header. ## */ +/* ## 2003-04-25 (daniel.scheibli@edelbyte.org) ## */ /* ## - Updated the global debug flag (_DEBUG) handling ## */ /* ## of the source file (check for platform etc.). ## */ /* ## - Added new header holding the changelog. ## */ /* ## ## */ /* ######################################################################### */ -/* -Intel Open Source License - -Copyright (c) 2001 Intel Corporation -All rights reserved. -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: - - Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimer. - - Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - - Neither the name of the Intel Corporation nor the names of its contributors - may be used to endorse or promote products derived from this software - without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ``AS IS'' -AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -ARE DISCLAIMED. IN NO EVENT SHALL THE INTEL OR ITS CONTRIBUTORS BE LIABLE -FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE -USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -*/ -// ========================================================================== -// Copyright (C) 1997-2000 Intel Corporation -// All rights reserved -// INTEL CORPORATION PROPRIETARY INFORMATION -// This software is supplied under the terms of a license agreement or -// nondisclosure agreement with Intel Corporation and may not be copied -// or disclosed except in accordance with the terms of that agreement. -// ========================================================================== -// -// ICFOpenDialog.cpp: Implementation of the CICFOpenDialog class, which -// extends the standard CFileDialog class with additional functionality for -// opening Iometer's .ICF (Iometer Configuration File) files. -// -////////////////////////////////////////////////////////////////////// -/* ######################################################################### */ #include "stdafx.h" @@ -80,12 +77,12 @@ // will be a MFC hacker who could advice here. // [1] = http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vclib/html/_mfc_debug_new.asp // -#if defined (_WIN32) || defined (_WIN64) -#ifdef _DEBUG -#define new DEBUG_NEW -#undef THIS_FILE -static char THIS_FILE[] = __FILE__; -#endif +#if defined(IOMTR_OS_WIN32) || defined(IOMTR_OS_WIN64) + #ifdef _DEBUG + #define new DEBUG_NEW + #undef THIS_FILE + static char THIS_FILE[] = __FILE__; + #endif #endif --- ICFOpenDialog.h Sat Jul 19 10:21:47 2003 +++ ICFOpenDialog.h.mod Sat Oct 18 18:31:22 2003 @@ -1,50 +1,64 @@ -/* -Intel Open Source License - -Copyright (c) 2001 Intel Corporation -All rights reserved. -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: - - Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimer. - - Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - - Neither the name of the Intel Corporation nor the names of its contributors - may be used to endorse or promote products derived from this software - without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ``AS IS'' -AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -ARE DISCLAIMED. IN NO EVENT SHALL THE INTEL OR ITS CONTRIBUTORS BE LIABLE -FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE -USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -*/ -// ========================================================================== -// Copyright (C) 1997-2000 Intel Corporation -// All rights reserved -// INTEL CORPORATION PROPRIETARY INFORMATION -// This software is supplied under the terms of a license agreement or -// nondisclosure agreement with Intel Corporation and may not be copied -// or disclosed except in accordance with the terms of that agreement. -// ========================================================================== -// -// ICFOpenDialog.h: Interface for the CICFOpenDialog class, which -// extends the standard CFileDialog class with additional functionality for -// opening Iometer's .ICF (Iometer Configuration File) files. -// -////////////////////////////////////////////////////////////////////// - -#if !defined(ICFOPENDIALOG_DEFINED) +/* ######################################################################### */ +/* ## ## */ +/* ## (Iometer) / ICFOpenDialog.h ## */ +/* ## ## */ +/* ## ------------------------------------------------------------------- ## */ +/* ## ## */ +/* ## Job .......: Interface for the CICFOpenDialog class, which extends ## */ +/* ## the standard CFileDialog class with additional ## */ +/* ## functionality for opening Iometer's .ICF (Iometer ## */ +/* ## Configuration File) files. ## */ +/* ## ## */ +/* ## ------------------------------------------------------------------- ## */ +/* ## ## */ +/* ## Intel Open Source License ## */ +/* ## ## */ +/* ## Copyright (c) 2001 Intel Corporation ## */ +/* ## All rights reserved. ## */ +/* ## Redistribution and use in source and binary forms, with or ## */ +/* ## without modification, are permitted provided that the following ## */ +/* ## conditions are met: ## */ +/* ## ## */ +/* ## Redistributions of source code must retain the above copyright ## */ +/* ## notice, this list of conditions and the following disclaimer. ## */ +/* ## ## */ +/* ## Redistributions in binary form must reproduce the above copyright ## */ +/* ## notice, this list of conditions and the following disclaimer in ## */ +/* ## the documentation and/or other materials provided with the ## */ +/* ## distribution. ## */ +/* ## ## */ +/* ## Neither the name of the Intel Corporation nor the names of its ## */ +/* ## contributors may be used to endorse or promote products derived ## */ +/* ## from this software without specific prior written permission. ## */ +/* ## ## */ +/* ## THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND ## */ +/* ## CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, ## */ +/* ## INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF ## */ +/* ## MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE ## */ +/* ## DISCLAIMED. IN NO EVENT SHALL THE INTEL OR ITS CONTRIBUTORS BE ## */ +/* ## LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, ## */ +/* ## OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, ## */ +/* ## PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, ## */ +/* ## OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY ## */ +/* ## THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR ## */ +/* ## TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT ## */ +/* ## OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY ## */ +/* ## OF SUCH DAMAGE. ## */ +/* ## ## */ +/* ## ------------------------------------------------------------------- ## */ +/* ## ## */ +/* ## Remarks ...: ## */ +/* ## ## */ +/* ## ------------------------------------------------------------------- ## */ +/* ## ## */ +/* ## Changes ...: 2003-10-17 (daniel.scheibli@edelbyte.org) ## */ +/* ## - Moved to the use of the IOMTR_[OSFAMILY|OS|CPU]_* ## */ +/* ## global defines. ## */ +/* ## - Integrated the License Statement into this header. ## */ +/* ## - Added new header holding the changelog. ## */ +/* ## ## */ +/* ######################################################################### */ +#ifndef ICFOPENDIALOG_DEFINED #define ICFOPENDIALOG_DEFINED --- ICFSaveDialog.cpp Sat Jul 19 10:21:47 2003 +++ ICFSaveDialog.cpp.mod Sat Oct 18 21:54:51 2003 @@ -4,7 +4,46 @@ /* ## ## */ /* ## ------------------------------------------------------------------- ## */ /* ## ## */ -/* ## Job .......: ... ## */ +/* ## Job .......: Implementation of the CICFSaveDialog class, which ## */ +/* ## extends the standard CFileDialog class with ## */ +/* ## additional functionality for saving Iometer's .ICF ## */ +/* ## (Iometer Configuration File) files. ## */ +/* ## ## */ +/* ## ------------------------------------------------------------------- ## */ +/* ## ## */ +/* ## Intel Open Source License ## */ +/* ## ## */ +/* ## Copyright (c) 2001 Intel Corporation ## */ +/* ## All rights reserved. ## */ +/* ## Redistribution and use in source and binary forms, with or ## */ +/* ## without modification, are permitted provided that the following ## */ +/* ## conditions are met: ## */ +/* ## ## */ +/* ## Redistributions of source code must retain the above copyright ## */ +/* ## notice, this list of conditions and the following disclaimer. ## */ +/* ## ## */ +/* ## Redistributions in binary form must reproduce the above copyright ## */ +/* ## notice, this list of conditions and the following disclaimer in ## */ +/* ## the documentation and/or other materials provided with the ## */ +/* ## distribution. ## */ +/* ## ## */ +/* ## Neither the name of the Intel Corporation nor the names of its ## */ +/* ## contributors may be used to endorse or promote products derived ## */ +/* ## from this software without specific prior written permission. ## */ +/* ## ## */ +/* ## THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND ## */ +/* ## CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, ## */ +/* ## INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF ## */ +/* ## MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE ## */ +/* ## DISCLAIMED. IN NO EVENT SHALL THE INTEL OR ITS CONTRIBUTORS BE ## */ +/* ## LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, ## */ +/* ## OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, ## */ +/* ## PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, ## */ +/* ## OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY ## */ +/* ## THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR ## */ +/* ## TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT ## */ +/* ## OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY ## */ +/* ## OF SUCH DAMAGE. ## */ /* ## ## */ /* ## ------------------------------------------------------------------- ## */ /* ## ## */ @@ -12,58 +51,16 @@ /* ## ## */ /* ## ------------------------------------------------------------------- ## */ /* ## ## */ -/* ## Changes ...: 2003-04-25 (daniel.scheibli@edelbyte.org) ## */ +/* ## Changes ...: 2003-10-17 (daniel.scheibli@edelbyte.org) ## */ +/* ## - Moved to the use of the IOMTR_[OSFAMILY|OS|CPU]_* ## */ +/* ## global defines. ## */ +/* ## - Integrated the License Statement into this header. ## */ +/* ## 2003-04-25 (daniel.scheibli@edelbyte.org) ## */ /* ## - Updated the global debug flag (_DEBUG) handling ## */ /* ## of the source file (check for platform etc.). ## */ /* ## - Added new header holding the changelog. ## */ /* ## ## */ /* ######################################################################### */ -/* -Intel Open Source License - -Copyright (c) 2001 Intel Corporation -All rights reserved. -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: - - Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimer. - - Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - - Neither the name of the Intel Corporation nor the names of its contributors - may be used to endorse or promote products derived from this software - without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ``AS IS'' -AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -ARE DISCLAIMED. IN NO EVENT SHALL THE INTEL OR ITS CONTRIBUTORS BE LIABLE -FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE -USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -*/ -// ========================================================================== -// Copyright (C) 1997-2000 Intel Corporation -// All rights reserved -// INTEL CORPORATION PROPRIETARY INFORMATION -// This software is supplied under the terms of a license agreement or -// nondisclosure agreement with Intel Corporation and may not be copied -// or disclosed except in accordance with the terms of that agreement. -// ========================================================================== -// -// ICFSaveDialog.cpp: Implementation of the CICFSaveDialog class, which -// extends the standard CFileDialog class with additional functionality for -// saving Iometer's .ICF (Iometer Configuration File) files. -// -////////////////////////////////////////////////////////////////////// -/* ######################################################################### */ #include "stdafx.h" @@ -80,12 +77,12 @@ // will be a MFC hacker who could advice here. // [1] = http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vclib/html/_mfc_debug_new.asp // -#if defined (_WIN32) || defined (_WIN64) -#ifdef _DEBUG -#define new DEBUG_NEW -#undef THIS_FILE -static char THIS_FILE[] = __FILE__; -#endif +#if defined(IOMTR_OS_WIN32) || defined(IOMTR_OS_WIN64) + #ifdef _DEBUG + #define new DEBUG_NEW + #undef THIS_FILE + static char THIS_FILE[] = __FILE__; + #endif #endif --- ICFSaveDialog.h Sat Jul 19 10:21:47 2003 +++ ICFSaveDialog.h.mod Sat Oct 18 18:39:16 2003 @@ -1,50 +1,64 @@ -/* -Intel Open Source License - -Copyright (c) 2001 Intel Corporation -All rights reserved. -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: - - Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimer. - - Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - - Neither the name of the Intel Corporation nor the names of its contributors - may be used to endorse or promote products derived from this software - without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ``AS IS'' -AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -ARE DISCLAIMED. IN NO EVENT SHALL THE INTEL OR ITS CONTRIBUTORS BE LIABLE -FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE -USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -*/ -// ========================================================================== -// Copyright (C) 1997-2000 Intel Corporation -// All rights reserved -// INTEL CORPORATION PROPRIETARY INFORMATION -// This software is supplied under the terms of a license agreement or -// nondisclosure agreement with Intel Corporation and may not be copied -// or disclosed except in accordance with the terms of that agreement. -// ========================================================================== -// -// ICFSaveDialog.h: Interface for the CICFSaveDialog class, which -// extends the standard CFileDialog class with additional functionality for -// saving Iometer's .ICF (Iometer Configuration File) files. -// -////////////////////////////////////////////////////////////////////// - -#if !defined(ICFSAVEDIALOG_DEFINED) +/* ######################################################################### */ +/* ## ## */ +/* ## (Iometer) / ICFSaveDialog.h ## */ +/* ## ## */ +/* ## ------------------------------------------------------------------- ## */ +/* ## ## */ +/* ## Job .......: Interface for the CICFSaveDialog class, which ## */ +/* ## extends the standard CFileDialog class with ## */ +/* ## additional functionality for saving Iometer's .ICF ## */ +/* ## (Iometer Configuration File) files. ## */ +/* ## ## */ +/* ## ------------------------------------------------------------------- ## */ +/* ## ## */ +/* ## Intel Open Source License ## */ +/* ## ## */ +/* ## Copyright (c) 2001 Intel Corporation ## */ +/* ## All rights reserved. ## */ +/* ## Redistribution and use in source and binary forms, with or ## */ +/* ## without modification, are permitted provided that the following ## */ +/* ## conditions are met: ## */ +/* ## ## */ +/* ## Redistributions of source code must retain the above copyright ## */ +/* ## notice, this list of conditions and the following disclaimer. ## */ +/* ## ## */ +/* ## Redistributions in binary form must reproduce the above copyright ## */ +/* ## notice, this list of conditions and the following disclaimer in ## */ +/* ## the documentation and/or other materials provided with the ## */ +/* ## distribution. ## */ +/* ## ## */ +/* ## Neither the name of the Intel Corporation nor the names of its ## */ +/* ## contributors may be used to endorse or promote products derived ## */ +/* ## from this software without specific prior written permission. ## */ +/* ## ## */ +/* ## THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND ## */ +/* ## CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, ## */ +/* ## INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF ## */ +/* ## MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE ## */ +/* ## DISCLAIMED. IN NO EVENT SHALL THE INTEL OR ITS CONTRIBUTORS BE ## */ +/* ## LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, ## */ +/* ## OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, ## */ +/* ## PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, ## */ +/* ## OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY ## */ +/* ## THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR ## */ +/* ## TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT ## */ +/* ## OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY ## */ +/* ## OF SUCH DAMAGE. ## */ +/* ## ## */ +/* ## ------------------------------------------------------------------- ## */ +/* ## ## */ +/* ## Remarks ...: ## */ +/* ## ## */ +/* ## ------------------------------------------------------------------- ## */ +/* ## ## */ +/* ## Changes ...: 2003-10-17 (daniel.scheibli@edelbyte.org) ## */ +/* ## - Moved to the use of the IOMTR_[OSFAMILY|OS|CPU]_* ## */ +/* ## global defines. ## */ +/* ## - Integrated the License Statement into this header. ## */ +/* ## - Added new header holding the changelog. ## */ +/* ## ## */ +/* ######################################################################### */ +#ifndef ICFSAVEDIALOG_DEFINED #define ICFSAVEDIALOG_DEFINED --- ICF_ifstream.cpp Sat Jul 19 10:21:48 2003 +++ ICF_ifstream.cpp.mod Sat Oct 18 21:56:49 2003 @@ -4,7 +4,46 @@ /* ## ## */ /* ## ------------------------------------------------------------------- ## */ /* ## ## */ -/* ## Job .......: ... ## */ +/* ## Job .......: Implementation of the ICF_ifstream class, which ## */ +/* ## extends the standard "ifstream" class with ## */ +/* ## additional functionality for reading and writing ## */ +/* ## Iometer's .ICF (Iometer Configuration File) files. ## */ +/* ## ## */ +/* ## ------------------------------------------------------------------- ## */ +/* ## ## */ +/* ## Intel Open Source License ## */ +/* ## ## */ +/* ## Copyright (c) 2001 Intel Corporation ## */ +/* ## All rights reserved. ## */ +/* ## Redistribution and use in source and binary forms, with or ## */ +/* ## without modification, are permitted provided that the following ## */ +/* ## conditions are met: ## */ +/* ## ## */ +/* ## Redistributions of source code must retain the above copyright ## */ +/* ## notice, this list of conditions and the following disclaimer. ## */ +/* ## ## */ +/* ## Redistributions in binary form must reproduce the above copyright ## */ +/* ## notice, this list of conditions and the following disclaimer in ## */ +/* ## the documentation and/or other materials provided with the ## */ +/* ## distribution. ## */ +/* ## ## */ +/* ## Neither the name of the Intel Corporation nor the names of its ## */ +/* ## contributors may be used to endorse or promote products derived ## */ +/* ## from this software without specific prior written permission. ## */ +/* ## ## */ +/* ## THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND ## */ +/* ## CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, ## */ +/* ## INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF ## */ +/* ## MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE ## */ +/* ## DISCLAIMED. IN NO EVENT SHALL THE INTEL OR ITS CONTRIBUTORS BE ## */ +/* ## LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, ## */ +/* ## OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, ## */ +/* ## PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, ## */ +/* ## OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY ## */ +/* ## THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR ## */ +/* ## TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT ## */ +/* ## OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY ## */ +/* ## OF SUCH DAMAGE. ## */ /* ## ## */ /* ## ------------------------------------------------------------------- ## */ /* ## ## */ @@ -12,58 +51,16 @@ /* ## ## */ /* ## ------------------------------------------------------------------- ## */ /* ## ## */ -/* ## Changes ...: 2003-04-25 (daniel.scheibli@edelbyte.org) ## */ +/* ## Changes ...: 2003-10-17 (daniel.scheibli@edelbyte.org) ## */ +/* ## - Moved to the use of the IOMTR_[OSFAMILY|OS|CPU]_* ## */ +/* ## global defines. ## */ +/* ## - Integrated the License Statement into this header. ## */ +/* ## 2003-04-25 (daniel.scheibli@edelbyte.org) ## */ /* ## - Updated the global debug flag (_DEBUG) handling ## */ /* ## of the source file (check for platform etc.). ## */ /* ## - Added new header holding the changelog. ## */ /* ## ## */ /* ######################################################################### */ -/* -Intel Open Source License - -Copyright (c) 2001 Intel Corporation -All rights reserved. -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: - - Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimer. - - Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - - Neither the name of the Intel Corporation nor the names of its contributors - may be used to endorse or promote products derived from this software - without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ``AS IS'' -AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -ARE DISCLAIMED. IN NO EVENT SHALL THE INTEL OR ITS CONTRIBUTORS BE LIABLE -FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE -USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -*/ -// ========================================================================== -// Copyright (C) 1997-2000 Intel Corporation -// All rights reserved -// INTEL CORPORATION PROPRIETARY INFORMATION -// This software is supplied under the terms of a license agreement or -// nondisclosure agreement with Intel Corporation and may not be copied -// or disclosed except in accordance with the terms of that agreement. -// ========================================================================== -// -// ICF_ifstream.cpp: Implementation of the ICF_ifstream class, which extends -// the standard "ifstream" class with additional functionality for reading -// and writing Iometer's .ICF (Iometer Configuration File) files. -// -////////////////////////////////////////////////////////////////////// -/* ######################################################################### */ #include "stdafx.h" @@ -80,12 +77,12 @@ // will be a MFC hacker who could advice here. // [1] = http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vclib/html/_mfc_debug_new.asp // -#if defined (_WIN32) || defined (_WIN64) -#ifdef _DEBUG -#define new DEBUG_NEW -#undef THIS_FILE -static char THIS_FILE[] = __FILE__; -#endif +#if defined(IOMTR_OS_WIN32) || defined(IOMTR_OS_WIN64) + #ifdef _DEBUG + #define new DEBUG_NEW + #undef THIS_FILE + static char THIS_FILE[] = __FILE__; + #endif #endif --- ICF_ifstream.h Sat Jul 19 10:21:48 2003 +++ ICF_ifstream.h.mod Sat Oct 18 18:51:13 2003 @@ -1,66 +1,87 @@ -/* -Intel Open Source License - -Copyright (c) 2001 Intel Corporation -All rights reserved. -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: - - Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimer. - - Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - - Neither the name of the Intel Corporation nor the names of its contributors - may be used to endorse or promote products derived from this software - without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ``AS IS'' -AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -ARE DISCLAIMED. IN NO EVENT SHALL THE INTEL OR ITS CONTRIBUTORS BE LIABLE -FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE -USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -*/ -// ========================================================================== -// Copyright (C) 1997-2000 Intel Corporation -// All rights reserved -// INTEL CORPORATION PROPRIETARY INFORMATION -// This software is supplied under the terms of a license agreement or -// nondisclosure agreement with Intel Corporation and may not be copied -// or disclosed except in accordance with the terms of that agreement. -// ========================================================================== -// -// ICF_ifstream.h: Interface for the ICF_ifstream class, which extends -// the standard "ifstream" class with additional functionality for reading -// and writing Iometer's .ICF (Iometer Configuration File) files. -// -// ICF_ifstream should be used to read Iometer configuration files (ICFs). -// Once a config file is opened, the calling function should... -// -// version = GetVersion(); if version information is desired -// SkipTo("'TEST SETUP"); or some other section... the string search -// is case-insensitive, and looks for a left-side match (extra -// characters, if present, are ignored in the comparison). -// WARNING: Don't look for a MANAGER comment, for example, if -// you may first encounter a MANAGERLIST in the file -- this will -// be considered a match! -// GetPair(key, value); and handle key, value pairs until key is the -// end-of-section marker, like "'End TEST SETUP" -// -// (Make sure all return values are checked and handled appropriately.) -// -////////////////////////////////////////////////////////////////////// - +/* ######################################################################### */ +/* ## ## */ +/* ## (Iometer) / ICF_ifstream.h ## */ +/* ## ## */ +/* ## ------------------------------------------------------------------- ## */ +/* ## ## */ +/* ## Job .......: Interface for the ICF_ifstream class, which extends ## */ +/* ## the standard "ifstream" class with additional ## */ +/* ## functionality for reading and writing Iometer's .ICF ## */ +/* ## (Iometer Configuration File) files. ## */ +/* ## ## */ +/* ## ------------------------------------------------------------------- ## */ +/* ## ## */ +/* ## Intel Open Source License ## */ +/* ## ## */ +/* ## Copyright (c) 2001 Intel Corporation ## */ +/* ## All rights reserved. ## */ +/* ## Redistribution and use in source and binary forms, with or ## */ +/* ## without modification, are permitted provided that the following ## */ +/* ## conditions are met: ## */ +/* ## ## */ +/* ## Redistributions of source code must retain the above copyright ## */ +/* ## notice, this list of conditions and the following disclaimer. ## */ +/* ## ## */ +/* ## Redistributions in binary form must reproduce the above copyright ## */ +/* ## notice, this list of conditions and the following disclaimer in ## */ +/* ## the documentation and/or other materials provided with the ## */ +/* ## distribution. ## */ +/* ## ## */ +/* ## Neither the name of the Intel Corporation nor the names of its ## */ +/* ## contributors may be used to endorse or promote products derived ## */ +/* ## from this software without specific prior written permission. ## */ +/* ## ## */ +/* ## THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND ## */ +/* ## CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, ## */ +/* ## INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF ## */ +/* ## MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE ## */ +/* ## DISCLAIMED. IN NO EVENT SHALL THE INTEL OR ITS CONTRIBUTORS BE ## */ +/* ## LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, ## */ +/* ## OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, ## */ +/* ## PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, ## */ +/* ## OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY ## */ +/* ## THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR ## */ +/* ## TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT ## */ +/* ## OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY ## */ +/* ## OF SUCH DAMAGE. ## */ +/* ## ## */ +/* ## ------------------------------------------------------------------- ## */ +/* ## ## */ +/* ## Remarks ...: ICF_ifstream should be used to read Iometer ## */ +/* ## configuration files (ICFs). Once a config file is ## */ +/* ## opened, the calling function should. ## */ +/* ## ## */ +/* ## version = GetVersion(); if version information is ## */ +/* ## desired ## */ +/* ## SkipTo("'TEST SETUP"); or some other section... the ## */ +/* ## string search is case-insen ## */ +/* ## sitive, and looks for a left- ## */ +/* ## side match (extra characters, ## */ +/* ## if present, are ignored in the ## */ +/* ## comparison). ## */ +/* ## WARNING: Don't look for a MANAGER comment, for ## */ +/* ## example, if you may first encounter a ## */ +/* ## MANAGERLIST in the file -- this will be ## */ +/* ## considered a match! ## */ +/* ## GetPair(key, value); and handle key, value pairs ## */ +/* ## until key is the end-of-section marker, like ## */ +/* ## "'End TEST SETUP" ## */ +/* ## ## */ +/* ## (Make sure all return values are checked and handled ## */ +/* ## appropriately.) ## */ +/* ## ## */ +/* ## ------------------------------------------------------------------- ## */ +/* ## ## */ +/* ## Changes ...: 2003-10-17 (daniel.scheibli@edelbyte.org) ## */ +/* ## - Moved to the use of the IOMTR_[OSFAMILY|OS|CPU]_* ## */ +/* ## global defines. ## */ +/* ## - Integrated the License Statement into this header. ## */ +/* ## - Added new header holding the changelog. ## */ +/* ## ## */ +/* ######################################################################### */ #ifndef ICF_IFSTREAM_DEFINED #define ICF_IFSTREAM_DEFINED + #include using namespace std; --- IOPerformance.cpp Sat Oct 18 23:29:15 2003 +++ IOPerformance.cpp.mod Sat Oct 18 23:32:19 2003 @@ -431,7 +431,7 @@ // If there are more than one processors, well, we get the speed of the first one. speed = infop.pi_clock; -#elif defined(LINUX) +#elif defined(IOMTR_OS_LINUX) // nop #else #warning ===> WARNING: You have to do some coding here to get the port done! --- IOTime.cpp Sat Oct 18 23:29:28 2003 +++ IOTime.cpp.mod Sat Oct 18 23:35:27 2003 @@ -182,7 +182,7 @@ unsigned __int64 __getReg (int); - #ifdef _M_IA64 + #if defined(IOMTR_CPU_IA64) #pragma intrinsic (__getReg) #endif // _M_IA64 --- Iometer.dsp Sun Jul 27 20:28:44 2003 +++ Iometer.dsp.mod Sun Oct 19 00:03:57 2003 @@ -47,7 +47,7 @@ # ADD BASE MTL /nologo /mktyplib203 /win32 # ADD MTL /nologo /mktyplib203 /win32 # ADD BASE RSC /l 0x409 -# ADD RSC /l 0x409 /d "_GALILEO_" +# ADD RSC /l 0x409 /d "_GALILEO_" /D "IOMTR_OSFAMILY_WINDOWS" /D "IOMTR_OS_WIN32" /D "IOMTR_CPU_I386" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo @@ -75,7 +75,7 @@ # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 # ADD BASE RSC /l 0x409 /d "_DEBUG" -# ADD RSC /l 0x409 /d "_DEBUG" /d "_GALILEO_" +# ADD RSC /l 0x409 /d "_DEBUG" /d "_GALILEO_" /D "IOMTR_OSFAMILY_WINDOWS" /D "IOMTR_OS_WIN32" /D "IOMTR_CPU_I386" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo --- LegalBox.cpp Fri Oct 17 19:57:09 2003 +++ LegalBox.cpp.mod Sat Oct 18 23:00:43 2003 @@ -81,7 +81,7 @@ // will be a MFC hacker who could advice here. // [1] = http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vclib/html/_mfc_debug_new.asp // -#if defined (_WIN32) || defined (_WIN64) +#if defined(IOMTR_OS_WIN32) || defined(IOMTR_OS_WIN64) #ifdef _DEBUG #define new DEBUG_NEW #undef THIS_FILE --- MainFrm.cpp Sat Jul 19 10:22:15 2003 +++ MainFrm.cpp.mod Sat Oct 18 17:45:08 2003 @@ -4,7 +4,45 @@ /* ## ## */ /* ## ------------------------------------------------------------------- ## */ /* ## ## */ -/* ## Job .......: ... ## */ +/* ## Job .......: Implementation of the CMainFrame class for Iometer. ## */ +/* ## This class contains almost nothing but AppWizard- ## */ +/* ## generated code. ## */ +/* ## ## */ +/* ## ------------------------------------------------------------------- ## */ +/* ## ## */ +/* ## Intel Open Source License ## */ +/* ## ## */ +/* ## Copyright (c) 2001 Intel Corporation ## */ +/* ## All rights reserved. ## */ +/* ## Redistribution and use in source and binary forms, with or ## */ +/* ## without modification, are permitted provided that the following ## */ +/* ## conditions are met: ## */ +/* ## ## */ +/* ## Redistributions of source code must retain the above copyright ## */ +/* ## notice, this list of conditions and the following disclaimer. ## */ +/* ## ## */ +/* ## Redistributions in binary form must reproduce the above copyright ## */ +/* ## notice, this list of conditions and the following disclaimer in ## */ +/* ## the documentation and/or other materials provided with the ## */ +/* ## distribution. ## */ +/* ## ## */ +/* ## Neither the name of the Intel Corporation nor the names of its ## */ +/* ## contributors may be used to endorse or promote products derived ## */ +/* ## from this software without specific prior written permission. ## */ +/* ## ## */ +/* ## THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND ## */ +/* ## CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, ## */ +/* ## INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF ## */ +/* ## MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE ## */ +/* ## DISCLAIMED. IN NO EVENT SHALL THE INTEL OR ITS CONTRIBUTORS BE ## */ +/* ## LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, ## */ +/* ## OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, ## */ +/* ## PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, ## */ +/* ## OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY ## */ +/* ## THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR ## */ +/* ## TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT ## */ +/* ## OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY ## */ +/* ## OF SUCH DAMAGE. ## */ /* ## ## */ /* ## ------------------------------------------------------------------- ## */ /* ## ## */ @@ -12,57 +50,16 @@ /* ## ## */ /* ## ------------------------------------------------------------------- ## */ /* ## ## */ -/* ## Changes ...: 2003-04-25 (daniel.scheibli@edelbyte.org) ## */ +/* ## Changes ...: 2003-10-17 (daniel.scheibli@edelbyte.org) ## */ +/* ## - Moved to the use of the IOMTR_[OSFAMILY|OS|CPU]_* ## */ +/* ## global defines. ## */ +/* ## - Integrated the License Statement into this header. ## */ +/* ## 2003-04-25 (daniel.scheibli@edelbyte.org) ## */ /* ## - Updated the global debug flag (_DEBUG) handling ## */ /* ## of the source file (check for platform etc.). ## */ /* ## - Added new header holding the changelog. ## */ /* ## ## */ /* ######################################################################### */ -/* -Intel Open Source License - -Copyright (c) 2001 Intel Corporation -All rights reserved. -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: - - Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimer. - - Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - - Neither the name of the Intel Corporation nor the names of its contributors - may be used to endorse or promote products derived from this software - without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ``AS IS'' -AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -ARE DISCLAIMED. IN NO EVENT SHALL THE INTEL OR ITS CONTRIBUTORS BE LIABLE -FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE -USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -*/ -// ========================================================================== -// Copyright (C) 1997-2000 Intel Corporation -// All rights reserved -// INTEL CORPORATION PROPRIETARY INFORMATION -// This software is supplied under the terms of a license agreement or -// nondisclosure agreement with Intel Corporation and may not be copied -// or disclosed except in accordance with the terms of that agreement. -// ========================================================================== -// -// MainFrm.cpp: Implementation of the CMainFrame class for Iometer. This -// class contains almost nothing but AppWizard-generated code. -// -////////////////////////////////////////////////////////////////////// -/* ######################################################################### */ #include "stdafx.h" @@ -80,12 +77,12 @@ // will be a MFC hacker who could advice here. // [1] = http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vclib/html/_mfc_debug_new.asp // -#if defined (_WIN32) || defined (_WIN64) -#ifdef _DEBUG -#define new DEBUG_NEW -#undef THIS_FILE -static char THIS_FILE[] = __FILE__; -#endif +#if defined(IOMTR_OS_WIN32) || defined(IOMTR_OS_WIN64) + #ifdef _DEBUG + #define new DEBUG_NEW + #undef THIS_FILE + static char THIS_FILE[] = __FILE__; + #endif #endif --- MainFrm.h Sat Jul 19 10:22:15 2003 +++ MainFrm.h.mod Sat Oct 18 17:47:12 2003 @@ -1,50 +1,64 @@ -/* -Intel Open Source License - -Copyright (c) 2001 Intel Corporation -All rights reserved. -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: - - Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimer. - - Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - - Neither the name of the Intel Corporation nor the names of its contributors - may be used to endorse or promote products derived from this software - without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ``AS IS'' -AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -ARE DISCLAIMED. IN NO EVENT SHALL THE INTEL OR ITS CONTRIBUTORS BE LIABLE -FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE -USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -*/ -// ========================================================================== -// Copyright (C) 1997-2000 Intel Corporation -// All rights reserved -// INTEL CORPORATION PROPRIETARY INFORMATION -// This software is supplied under the terms of a license agreement or -// nondisclosure agreement with Intel Corporation and may not be copied -// or disclosed except in accordance with the terms of that agreement. -// ========================================================================== -// -// MainFrm.h: Interface for Iometer's CMainFrame class. This class contains -// almost nothing but AppWizard-generated code. -// -////////////////////////////////////////////////////////////////////// - +/* ######################################################################### */ +/* ## ## */ +/* ## (Iometer) / MainFrm.h ## */ +/* ## ## */ +/* ## ------------------------------------------------------------------- ## */ +/* ## ## */ +/* ## Job .......: Interface for Iometer's CMainFrame class. This class ## */ +/* ## contains almost nothing but AppWizard-generated code. ## */ +/* ## ## */ +/* ## ------------------------------------------------------------------- ## */ +/* ## ## */ +/* ## Intel Open Source License ## */ +/* ## ## */ +/* ## Copyright (c) 2001 Intel Corporation ## */ +/* ## All rights reserved. ## */ +/* ## Redistribution and use in source and binary forms, with or ## */ +/* ## without modification, are permitted provided that the following ## */ +/* ## conditions are met: ## */ +/* ## ## */ +/* ## Redistributions of source code must retain the above copyright ## */ +/* ## notice, this list of conditions and the following disclaimer. ## */ +/* ## ## */ +/* ## Redistributions in binary form must reproduce the above copyright ## */ +/* ## notice, this list of conditions and the following disclaimer in ## */ +/* ## the documentation and/or other materials provided with the ## */ +/* ## distribution. ## */ +/* ## ## */ +/* ## Neither the name of the Intel Corporation nor the names of its ## */ +/* ## contributors may be used to endorse or promote products derived ## */ +/* ## from this software without specific prior written permission. ## */ +/* ## ## */ +/* ## THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND ## */ +/* ## CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, ## */ +/* ## INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF ## */ +/* ## MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE ## */ +/* ## DISCLAIMED. IN NO EVENT SHALL THE INTEL OR ITS CONTRIBUTORS BE ## */ +/* ## LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, ## */ +/* ## OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, ## */ +/* ## PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, ## */ +/* ## OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY ## */ +/* ## THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR ## */ +/* ## TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT ## */ +/* ## OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY ## */ +/* ## OF SUCH DAMAGE. ## */ +/* ## ## */ +/* ## ------------------------------------------------------------------- ## */ +/* ## ## */ +/* ## Remarks ...: ## */ +/* ## ## */ +/* ## ------------------------------------------------------------------- ## */ +/* ## ## */ +/* ## Changes ...: 2003-10-17 (daniel.scheibli@edelbyte.org) ## */ +/* ## - Moved to the use of the IOMTR_[OSFAMILY|OS|CPU]_* ## */ +/* ## global defines. ## */ +/* ## - Integrated the License Statement into this header. ## */ +/* ## - Added new header holding the changelog. ## */ +/* ## ## */ +/* ######################################################################### */ #ifndef FRAME_DEFINED #define FRAME_DEFINED + #include "IOCommon.h" --- Makefile-Linux.i386 Sun Jul 27 20:28:44 2003 +++ Makefile-Linux.i386.mod Sat Oct 18 23:38:54 2003 @@ -92,11 +92,9 @@ # Note 1) -DWORKAROUND_MOD_BUG can be dropped if -O is used in place of -g in CFLAGS # Note 2) -DDYNAMO_DESTRUCTIVE controls inclusion of destructive dynamo code. # Note 3) -D_DETAILS=1 -D_DEBUG=1 enables maximum debug information -# TODO: -DUNIX -DLINUX will be removed after the switch to IOMTR_* is completed!!! CFLAGS= -O3 \ -Wall \ -D_GNU_SOURCE \ - -DUNIX -DLINUX \ -DIOMTR_OSFAMILY_UNIX -DIOMTR_OS_LINUX \ -DIOMTR_CPU_I386 \ -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 \ --- Makefile-Solaris.Sparc Sun Jul 27 20:28:44 2003 +++ Makefile-Solaris.Sparc.mod Sat Oct 18 23:40:04 2003 @@ -83,14 +83,12 @@ # Note 1) -DWORKAROUND_MOD_BUG can be dropped if -O is used in place of -g in CFLAGS # Note 2) -DDYNAMO_DESTRUCTIVE controls inclusion of destructive dynamo code. # Note 3) -D_DETAILS=1 -D_DEBUG=1 enables maximum debug information -# TODO: -DUNIX -DSOLARIS will be removed after the switch to IOMTR_* is completed!!! # # Always enable CCFLAGS=-compat=4 on Sparc till the transition from compile # version SC4 to SC5 is complete. # This flag instructs the compiler to build SC4 binaries. CFLAGS= -O \ -Wall \ - -DUNIX -DSOLARIS \ -DIOMTR_OSFAMILY_UNIX -DIOMTR_OS_SOLARIS \ -DIOMTR_CPU_SPARC \ -D_LARGEFILE64_SOURCE \ --- Makefile-Solaris.i386 Sun Jul 27 20:28:44 2003 +++ Makefile-Solaris.i386.mod Sat Oct 18 23:40:48 2003 @@ -72,14 +72,12 @@ # Note 1) -DWORKAROUND_MOD_BUG can be dropped if -O is used in place of -g in CFLAGS # Note 2) -DDYNAMO_DESTRUCTIVE controls inclusion of destructive dynamo code. # Note 3) -D_DETAILS=1 -D_DEBUG=1 enables maximum debug information -# TODO: -DUNIX -DSOLARIS will be removed after the switch to IOMTR_* is completed!!! # # Always enable CCFLAGS=-compat=4 on Sparc till the transition from compile # version SC4 to SC5 is complete. # This flag instructs the compiler to build SC4 binaries. CFLAGS= -O \ -Wall \ - -DUNIX -DSOLARIS \ -DIOMTR_OSFAMILY_UNIX -DIOMTR_OS_SOLARIS \ -DIOMTR_CPU_I386 \ -D_LARGEFILE64_SOURCE \ --- Manager.cpp Sat Jul 19 10:22:18 2003 +++ Manager.cpp.mod Sat Oct 18 21:55:01 2003 @@ -4,7 +4,48 @@ /* ## ## */ /* ## ------------------------------------------------------------------- ## */ /* ## ## */ -/* ## Job .......: ... ## */ +/* ## Job .......: Implementation of the Manager class for Iometer, ## */ +/* ## which contains a list of workers and provides ## */ +/* ## functions for manager-level actions (creating and ## */ +/* ## removing workers, communication between Iometer and ## */ +/* ## a single copy of Dynamo, etc.). A Manager object is ## */ +/* ## created whenever a copy of Dynamo logs in. ## */ +/* ## ## */ +/* ## ------------------------------------------------------------------- ## */ +/* ## ## */ +/* ## Intel Open Source License ## */ +/* ## ## */ +/* ## Copyright (c) 2001 Intel Corporation ## */ +/* ## All rights reserved. ## */ +/* ## Redistribution and use in source and binary forms, with or ## */ +/* ## without modification, are permitted provided that the following ## */ +/* ## conditions are met: ## */ +/* ## ## */ +/* ## Redistributions of source code must retain the above copyright ## */ +/* ## notice, this list of conditions and the following disclaimer. ## */ +/* ## ## */ +/* ## Redistributions in binary form must reproduce the above copyright ## */ +/* ## notice, this list of conditions and the following disclaimer in ## */ +/* ## the documentation and/or other materials provided with the ## */ +/* ## distribution. ## */ +/* ## ## */ +/* ## Neither the name of the Intel Corporation nor the names of its ## */ +/* ## contributors may be used to endorse or promote products derived ## */ +/* ## from this software without specific prior written permission. ## */ +/* ## ## */ +/* ## THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND ## */ +/* ## CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, ## */ +/* ## INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF ## */ +/* ## MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE ## */ +/* ## DISCLAIMED. IN NO EVENT SHALL THE INTEL OR ITS CONTRIBUTORS BE ## */ +/* ## LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, ## */ +/* ## OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, ## */ +/* ## PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, ## */ +/* ## OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY ## */ +/* ## THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR ## */ +/* ## TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT ## */ +/* ## OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY ## */ +/* ## OF SUCH DAMAGE. ## */ /* ## ## */ /* ## ------------------------------------------------------------------- ## */ /* ## ## */ @@ -12,60 +53,16 @@ /* ## ## */ /* ## ------------------------------------------------------------------- ## */ /* ## ## */ -/* ## Changes ...: 2003-04-25 (daniel.scheibli@edelbyte.org) ## */ +/* ## Changes ...: 2003-10-17 (daniel.scheibli@edelbyte.org) ## */ +/* ## - Moved to the use of the IOMTR_[OSFAMILY|OS|CPU]_* ## */ +/* ## global defines. ## */ +/* ## - Integrated the License Statement into this header. ## */ +/* ## 2003-04-25 (daniel.scheibli@edelbyte.org) ## */ /* ## - Updated the global debug flag (_DEBUG) handling ## */ /* ## of the source file (check for platform etc.). ## */ /* ## - Added new header holding the changelog. ## */ /* ## ## */ /* ######################################################################### */ -/* -Intel Open Source License - -Copyright (c) 2001 Intel Corporation -All rights reserved. -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: - - Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimer. - - Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - - Neither the name of the Intel Corporation nor the names of its contributors - may be used to endorse or promote products derived from this software - without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ``AS IS'' -AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -ARE DISCLAIMED. IN NO EVENT SHALL THE INTEL OR ITS CONTRIBUTORS BE LIABLE -FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE -USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -*/ -// ========================================================================== -// Copyright (C) 1997-2000 Intel Corporation -// All rights reserved -// INTEL CORPORATION PROPRIETARY INFORMATION -// This software is supplied under the terms of a license agreement or -// nondisclosure agreement with Intel Corporation and may not be copied -// or disclosed except in accordance with the terms of that agreement. -// ========================================================================== -// -// Manager.cpp: Implementation of the Manager class for Iometer, which -// contains a list of workers and provides functions for manager-level -// actions (creating and removing workers, communication between Iometer and -// a single copy of Dynamo, etc.). A Manager object is created whenever a -// copy of Dynamo logs in. -// -////////////////////////////////////////////////////////////////////// -/* ######################################################################### */ #include "stdafx.h" @@ -84,12 +81,12 @@ // will be a MFC hacker who could advice here. // [1] = http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vclib/html/_mfc_debug_new.asp // -#if defined (_WIN32) || defined (_WIN64) -#ifdef _DEBUG -#define new DEBUG_NEW -#undef THIS_FILE -static char THIS_FILE[] = __FILE__; -#endif +#if defined(IOMTR_OS_WIN32) || defined(IOMTR_OS_WIN64) + #ifdef _DEBUG + #define new DEBUG_NEW + #undef THIS_FILE + static char THIS_FILE[] = __FILE__; + #endif #endif --- Manager.h Sat Jul 19 10:22:21 2003 +++ Manager.h.mod Sat Oct 18 18:57:36 2003 @@ -4,7 +4,45 @@ /* ## ## */ /* ## ------------------------------------------------------------------- ## */ /* ## ## */ -/* ## Job .......: ## */ +/* ## Job .......: Interface for Iometer's Manager class, which contains ## */ +/* ## a list of workers and provides functions for manager- ## */ +/* ## level actions. ## */ +/* ## ## */ +/* ## ------------------------------------------------------------------- ## */ +/* ## ## */ +/* ## Intel Open Source License ## */ +/* ## ## */ +/* ## Copyright (c) 2001 Intel Corporation ## */ +/* ## All rights reserved. ## */ +/* ## Redistribution and use in source and binary forms, with or ## */ +/* ## without modification, are permitted provided that the following ## */ +/* ## conditions are met: ## */ +/* ## ## */ +/* ## Redistributions of source code must retain the above copyright ## */ +/* ## notice, this list of conditions and the following disclaimer. ## */ +/* ## ## */ +/* ## Redistributions in binary form must reproduce the above copyright ## */ +/* ## notice, this list of conditions and the following disclaimer in ## */ +/* ## the documentation and/or other materials provided with the ## */ +/* ## distribution. ## */ +/* ## ## */ +/* ## Neither the name of the Intel Corporation nor the names of its ## */ +/* ## contributors may be used to endorse or promote products derived ## */ +/* ## from this software without specific prior written permission. ## */ +/* ## ## */ +/* ## THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND ## */ +/* ## CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, ## */ +/* ## INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF ## */ +/* ## MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE ## */ +/* ## DISCLAIMED. IN NO EVENT SHALL THE INTEL OR ITS CONTRIBUTORS BE ## */ +/* ## LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, ## */ +/* ## OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, ## */ +/* ## PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, ## */ +/* ## OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY ## */ +/* ## THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR ## */ +/* ## TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT ## */ +/* ## OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY ## */ +/* ## OF SUCH DAMAGE. ## */ /* ## ## */ /* ## ------------------------------------------------------------------- ## */ /* ## ## */ @@ -12,59 +50,18 @@ /* ## ## */ /* ## ------------------------------------------------------------------- ## */ /* ## ## */ -/* ## Changes ...: 2003-03-01 (daniel.scheibli@edelbyte.org) ## */ +/* ## Changes ...: 2003-10-17 (daniel.scheibli@edelbyte.org) ## */ +/* ## - Moved to the use of the IOMTR_[OSFAMILY|OS|CPU]_* ## */ +/* ## global defines. ## */ +/* ## - Integrated the License Statement into this header. ## */ +/* ## 2003-03-01 (daniel.scheibli@edelbyte.org) ## */ /* ## - Cut out the Windows Pipes support for ## */ /* ## communication efforts. ## */ /* ## ## */ /* ######################################################################### */ -/* -Intel Open Source License - -Copyright (c) 2001 Intel Corporation -All rights reserved. -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: - - Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimer. - - Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - - Neither the name of the Intel Corporation nor the names of its contributors - may be used to endorse or promote products derived from this software - without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ``AS IS'' -AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -ARE DISCLAIMED. IN NO EVENT SHALL THE INTEL OR ITS CONTRIBUTORS BE LIABLE -FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE -USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -*/ -// ========================================================================== -// Copyright (C) 1997-2000 Intel Corporation -// All rights reserved -// INTEL CORPORATION PROPRIETARY INFORMATION -// This software is supplied under the terms of a license agreement or -// nondisclosure agreement with Intel Corporation and may not be copied -// or disclosed except in accordance with the terms of that agreement. -// ========================================================================== -// -// Manager.h: Interface for Iometer's Manager class, which contains a list of -// workers and provides functions for manager-level actions. -// -////////////////////////////////////////////////////////////////////// -/* ######################################################################### */ - #ifndef MANAGER_DEFINED - #define MANAGER_DEFINED +#define MANAGER_DEFINED + #include "IOCommon.h" #include "Worker.h" --- ManagerList.cpp Sat Jul 19 10:22:21 2003 +++ ManagerList.cpp.mod Sat Oct 18 21:55:12 2003 @@ -9,11 +9,51 @@ /* ## ## */ /* ## ------------------------------------------------------------------- ## */ /* ## ## */ +/* ## Intel Open Source License ## */ +/* ## ## */ +/* ## Copyright (c) 2001 Intel Corporation ## */ +/* ## All rights reserved. ## */ +/* ## Redistribution and use in source and binary forms, with or ## */ +/* ## without modification, are permitted provided that the following ## */ +/* ## conditions are met: ## */ +/* ## ## */ +/* ## Redistributions of source code must retain the above copyright ## */ +/* ## notice, this list of conditions and the following disclaimer. ## */ +/* ## ## */ +/* ## Redistributions in binary form must reproduce the above copyright ## */ +/* ## notice, this list of conditions and the following disclaimer in ## */ +/* ## the documentation and/or other materials provided with the ## */ +/* ## distribution. ## */ +/* ## ## */ +/* ## Neither the name of the Intel Corporation nor the names of its ## */ +/* ## contributors may be used to endorse or promote products derived ## */ +/* ## from this software without specific prior written permission. ## */ +/* ## ## */ +/* ## THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND ## */ +/* ## CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, ## */ +/* ## INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF ## */ +/* ## MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE ## */ +/* ## DISCLAIMED. IN NO EVENT SHALL THE INTEL OR ITS CONTRIBUTORS BE ## */ +/* ## LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, ## */ +/* ## OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, ## */ +/* ## PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, ## */ +/* ## OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY ## */ +/* ## THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR ## */ +/* ## TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT ## */ +/* ## OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY ## */ +/* ## OF SUCH DAMAGE. ## */ +/* ## ## */ +/* ## ------------------------------------------------------------------- ## */ +/* ## ## */ /* ## Remarks ...: ## */ /* ## ## */ /* ## ------------------------------------------------------------------- ## */ /* ## ## */ -/* ## Changes ...: 2003-05-07 (daniel.scheibli@edelbyte.org) ## */ +/* ## Changes ...: 2003-10-17 (daniel.scheibli@edelbyte.org) ## */ +/* ## - Moved to the use of the IOMTR_[OSFAMILY|OS|CPU]_* ## */ +/* ## global defines. ## */ +/* ## - Integrated the License Statement into this header. ## */ +/* ## 2003-05-07 (daniel.scheibli@edelbyte.org) ## */ /* ## - Modified output of the current timestamp to ## */ /* ## contain milliseconds as well. ## */ /* ## 2003-05-01 (daniel.scheibli@edelbyte.org) ## */ @@ -28,54 +68,7 @@ /* ## - Added new header holding the changelog. ## */ /* ## ## */ /* ######################################################################### */ -/* -Intel Open Source License -Copyright (c) 2001 Intel Corporation -All rights reserved. -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: - - Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimer. - - Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - - Neither the name of the Intel Corporation nor the names of its contributors - may be used to endorse or promote products derived from this software - without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ``AS IS'' -AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -ARE DISCLAIMED. IN NO EVENT SHALL THE INTEL OR ITS CONTRIBUTORS BE LIABLE -FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE -USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -*/ -// ========================================================================== -// Copyright (C) 1997-2000 Intel Corporation -// All rights reserved -// INTEL CORPORATION PROPRIETARY INFORMATION -// This software is supplied under the terms of a license agreement or -// nondisclosure agreement with Intel Corporation and may not be copied -// or disclosed except in accordance with the terms of that agreement. -// ========================================================================== -// -// ManagerList.cpp: Implementation of the ManagerList class for Iometer, -// which contains a list of managers and provides functions for manager-list -// actions (creating and removing managers, communication between Iometer and -// all logged-in Dynamos, etc.). There is always exactly one ManagerList -// object in an instance of Iometer (CGalileoApp::manager_list). -// -////////////////////////////////////////////////////////////////////// -/* ######################################################################### */ #include "stdafx.h" #include "ManagerList.h" @@ -92,12 +85,12 @@ // will be a MFC hacker who could advice here. // [1] = http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vclib/html/_mfc_debug_new.asp // -#if defined (_WIN32) || defined (_WIN64) -#ifdef _DEBUG -#define new DEBUG_NEW -#undef THIS_FILE -static char THIS_FILE[] = __FILE__; -#endif +#if defined(IOMTR_OS_WIN32) || defined(IOMTR_OS_WIN64) + #ifdef _DEBUG + #define new DEBUG_NEW + #undef THIS_FILE + static char THIS_FILE[] = __FILE__; + #endif #endif --- ManagerList.h Sat Jul 19 10:22:21 2003 +++ ManagerList.h.mod Sat Oct 18 19:00:35 2003 @@ -1,48 +1,74 @@ -/* -Intel Open Source License - -Copyright (c) 2001 Intel Corporation -All rights reserved. -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: - - Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimer. - - Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - - Neither the name of the Intel Corporation nor the names of its contributors - may be used to endorse or promote products derived from this software - without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ``AS IS'' -AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -ARE DISCLAIMED. IN NO EVENT SHALL THE INTEL OR ITS CONTRIBUTORS BE LIABLE -FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE -USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -*/ -// ========================================================================== -// Copyright (C) 1997-2000 Intel Corporation -// All rights reserved -// INTEL CORPORATION PROPRIETARY INFORMATION -// This software is supplied under the terms of a license agreement or -// nondisclosure agreement with Intel Corporation and may not be copied -// or disclosed except in accordance with the terms of that agreement. -// ========================================================================== -// -// ManagerList.h: Interface for Iometer's ManagerList class, which contains -// a list of managers and provides functions for manager-list actions. -// -////////////////////////////////////////////////////////////////////// - +/* ######################################################################### */ +/* ## ## */ +/* ## Iometer / ManagerList.h ## */ +/* ## ## */ +/* ## ------------------------------------------------------------------- ## */ +/* ## ## */ +/* ## Job .......: Interface for Iometer's ManagerList class, which ## */ +/* ## contains a list of managers and provides functions ## */ +/* ## for manager-list actions. ## */ +/* ## ## */ +/* ## ------------------------------------------------------------------- ## */ +/* ## ## */ +/* ## Intel Open Source License ## */ +/* ## ## */ +/* ## Copyright (c) 2001 Intel Corporation ## */ +/* ## All rights reserved. ## */ +/* ## Redistribution and use in source and binary forms, with or ## */ +/* ## without modification, are permitted provided that the following ## */ +/* ## conditions are met: ## */ +/* ## ## */ +/* ## Redistributions of source code must retain the above copyright ## */ +/* ## notice, this list of conditions and the following disclaimer. ## */ +/* ## ## */ +/* ## Redistributions in binary form must reproduce the above copyright ## */ +/* ## notice, this list of conditions and the following disclaimer in ## */ +/* ## the documentation and/or other materials provided with the ## */ +/* ## distribution. ## */ +/* ## ## */ +/* ## Neither the name of the Intel Corporation nor the names of its ## */ +/* ## contributors may be used to endorse or promote products derived ## */ +/* ## from this software without specific prior written permission. ## */ +/* ## ## */ +/* ## THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND ## */ +/* ## CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, ## */ +/* ## INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF ## */ +/* ## MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE ## */ +/* ## DISCLAIMED. IN NO EVENT SHALL THE INTEL OR ITS CONTRIBUTORS BE ## */ +/* ## LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, ## */ +/* ## OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, ## */ +/* ## PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, ## */ +/* ## OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY ## */ +/* ## THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR ## */ +/* ## TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT ## */ +/* ## OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY ## */ +/* ## OF SUCH DAMAGE. ## */ +/* ## ## */ +/* ## ------------------------------------------------------------------- ## */ +/* ## ## */ +/* ## Remarks ...: ## */ +/* ## ## */ +/* ## ------------------------------------------------------------------- ## */ +/* ## ## */ +/* ## Changes ...: 2003-10-17 (daniel.scheibli@edelbyte.org) ## */ +/* ## - Moved to the use of the IOMTR_[OSFAMILY|OS|CPU]_* ## */ +/* ## global defines. ## */ +/* ## - Integrated the License Statement into this header. ## */ +/* ## 2003-05-07 (daniel.scheibli@edelbyte.org) ## */ +/* ## - Modified output of the current timestamp to ## */ +/* ## contain milliseconds as well. ## */ +/* ## 2003-05-01 (daniel.scheibli@edelbyte.org) ## */ +/* ## - Added output of current timestamp after each list ## */ +/* ## of results (in the result file - CSV format). ## */ +/* ## 2003-04-25 (daniel.scheibli@edelbyte.org) ## */ +/* ## - Updated the global debug flag (_DEBUG) handling ## */ +/* ## of the source file (check for platform etc.). ## */ +/* ## 2003-03-01 (daniel.scheibli@edelbyte.org) ## */ +/* ## - Cut out the Windows Pipes support for ## */ +/* ## communication efforts. ## */ +/* ## - Added new header holding the changelog. ## */ +/* ## ## */ +/* ######################################################################### */ #ifndef MANAGER_LIST_DEFINED #define MANAGER_LIST_DEFINED --- ManagerMap.cpp Sat Jul 19 10:22:24 2003 +++ ManagerMap.cpp.mod Sat Oct 18 21:55:24 2003 @@ -4,7 +4,45 @@ /* ## ## */ /* ## ------------------------------------------------------------------- ## */ /* ## ## */ -/* ## Job .......: ... ## */ +/* ## Job .......: Implementation of the ManagerMap class for Iometer, ## */ +/* ## which maintains the mapping between managers in an ## */ +/* ## .ICF file and the current Manager objects. ## */ +/* ## ## */ +/* ## ------------------------------------------------------------------- ## */ +/* ## ## */ +/* ## Intel Open Source License ## */ +/* ## ## */ +/* ## Copyright (c) 2001 Intel Corporation ## */ +/* ## All rights reserved. ## */ +/* ## Redistribution and use in source and binary forms, with or ## */ +/* ## without modification, are permitted provided that the following ## */ +/* ## conditions are met: ## */ +/* ## ## */ +/* ## Redistributions of source code must retain the above copyright ## */ +/* ## notice, this list of conditions and the following disclaimer. ## */ +/* ## ## */ +/* ## Redistributions in binary form must reproduce the above copyright ## */ +/* ## notice, this list of conditions and the following disclaimer in ## */ +/* ## the documentation and/or other materials provided with the ## */ +/* ## distribution. ## */ +/* ## ## */ +/* ## Neither the name of the Intel Corporation nor the names of its ## */ +/* ## contributors may be used to endorse or promote products derived ## */ +/* ## from this software without specific prior written permission. ## */ +/* ## ## */ +/* ## THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND ## */ +/* ## CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, ## */ +/* ## INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF ## */ +/* ## MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE ## */ +/* ## DISCLAIMED. IN NO EVENT SHALL THE INTEL OR ITS CONTRIBUTORS BE ## */ +/* ## LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, ## */ +/* ## OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, ## */ +/* ## PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, ## */ +/* ## OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY ## */ +/* ## THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR ## */ +/* ## TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT ## */ +/* ## OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY ## */ +/* ## OF SUCH DAMAGE. ## */ /* ## ## */ /* ## ------------------------------------------------------------------- ## */ /* ## ## */ @@ -12,58 +50,16 @@ /* ## ## */ /* ## ------------------------------------------------------------------- ## */ /* ## ## */ -/* ## Changes ...: 2003-04-25 (daniel.scheibli@edelbyte.org) ## */ +/* ## Changes ...: 2003-10-17 (daniel.scheibli@edelbyte.org) ## */ +/* ## - Moved to the use of the IOMTR_[OSFAMILY|OS|CPU]_* ## */ +/* ## global defines. ## */ +/* ## - Integrated the License Statement into this header. ## */ +/* ## 2003-04-25 (daniel.scheibli@edelbyte.org) ## */ /* ## - Updated the global debug flag (_DEBUG) handling ## */ /* ## of the source file (check for platform etc.). ## */ /* ## - Added new header holding the changelog. ## */ /* ## ## */ /* ######################################################################### */ -/* -Intel Open Source License - -Copyright (c) 2001 Intel Corporation -All rights reserved. -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: - - Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimer. - - Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - - Neither the name of the Intel Corporation nor the names of its contributors - may be used to endorse or promote products derived from this software - without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ``AS IS'' -AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -ARE DISCLAIMED. IN NO EVENT SHALL THE INTEL OR ITS CONTRIBUTORS BE LIABLE -FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE -USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -*/ -// ========================================================================== -// Copyright (C) 1997-2000 Intel Corporation -// All rights reserved -// INTEL CORPORATION PROPRIETARY INFORMATION -// This software is supplied under the terms of a license agreement or -// nondisclosure agreement with Intel Corporation and may not be copied -// or disclosed except in accordance with the terms of that agreement. -// ========================================================================== -// -// ManagerMap.cpp: Implementation of the ManagerMap class for Iometer, which -// maintains the mapping between managers in an .ICF file and the current -// Manager objects. -// -////////////////////////////////////////////////////////////////////// -/* ######################################################################### */ #include "stdafx.h" @@ -80,12 +76,12 @@ // will be a MFC hacker who could advice here. // [1] = http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vclib/html/_mfc_debug_new.asp // -#if defined (_WIN32) || defined (_WIN64) -#ifdef _DEBUG -#define new DEBUG_NEW -#undef THIS_FILE -static char THIS_FILE[] = __FILE__; -#endif +#if defined(IOMTR_OS_WIN32) || defined(IOMTR_OS_WIN64) + #ifdef _DEBUG + #define new DEBUG_NEW + #undef THIS_FILE + static char THIS_FILE[] = __FILE__; + #endif #endif --- ManagerMap.h Sat Jul 19 10:22:24 2003 +++ ManagerMap.h.mod Sat Oct 18 19:05:11 2003 @@ -1,56 +1,72 @@ -/* -Intel Open Source License - -Copyright (c) 2001 Intel Corporation -All rights reserved. -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: - - Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimer. - - Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - - Neither the name of the Intel Corporation nor the names of its contributors - may be used to endorse or promote products derived from this software - without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ``AS IS'' -AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -ARE DISCLAIMED. IN NO EVENT SHALL THE INTEL OR ITS CONTRIBUTORS BE LIABLE -FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE -USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -*/ -// ========================================================================== -// Copyright (C) 1997-2000 Intel Corporation -// All rights reserved -// INTEL CORPORATION PROPRIETARY INFORMATION -// This software is supplied under the terms of a license agreement or -// nondisclosure agreement with Intel Corporation and may not be copied -// or disclosed except in accordance with the terms of that agreement. -// ========================================================================== -// -// ManagerMap.h: Interface for Iometer's ManagerMap class, which maintains -// the mapping between managers in an .ICF file and the current Manager -// objects. -// -// This class is used when Iometer Configuration Files (ICF files) are being -// restored. Managers from the file (identified by name and a disambiguating -// ID number) are mapped to the actual running Managers by the ManagerList at -// file load time. -// -////////////////////////////////////////////////////////////////////// - +/* ######################################################################### */ +/* ## ## */ +/* ## (Iometer) / ManagerMap.h ## */ +/* ## ## */ +/* ## ------------------------------------------------------------------- ## */ +/* ## ## */ +/* ## Job .......: Interface for Iometer's ManagerMap class, which ## */ +/* ## maintains the mapping between managers in an .ICF ## */ +/* ## file and the current Manager objects. ## */ +/* ## ## */ +/* ## ------------------------------------------------------------------- ## */ +/* ## ## */ +/* ## Intel Open Source License ## */ +/* ## ## */ +/* ## Copyright (c) 2001 Intel Corporation ## */ +/* ## All rights reserved. ## */ +/* ## Redistribution and use in source and binary forms, with or ## */ +/* ## without modification, are permitted provided that the following ## */ +/* ## conditions are met: ## */ +/* ## ## */ +/* ## Redistributions of source code must retain the above copyright ## */ +/* ## notice, this list of conditions and the following disclaimer. ## */ +/* ## ## */ +/* ## Redistributions in binary form must reproduce the above copyright ## */ +/* ## notice, this list of conditions and the following disclaimer in ## */ +/* ## the documentation and/or other materials provided with the ## */ +/* ## distribution. ## */ +/* ## ## */ +/* ## Neither the name of the Intel Corporation nor the names of its ## */ +/* ## contributors may be used to endorse or promote products derived ## */ +/* ## from this software without specific prior written permission. ## */ +/* ## ## */ +/* ## THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND ## */ +/* ## CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, ## */ +/* ## INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF ## */ +/* ## MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE ## */ +/* ## DISCLAIMED. IN NO EVENT SHALL THE INTEL OR ITS CONTRIBUTORS BE ## */ +/* ## LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, ## */ +/* ## OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, ## */ +/* ## PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, ## */ +/* ## OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY ## */ +/* ## THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR ## */ +/* ## TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT ## */ +/* ## OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY ## */ +/* ## OF SUCH DAMAGE. ## */ +/* ## ## */ +/* ## ------------------------------------------------------------------- ## */ +/* ## ## */ +/* ## Remarks ...: - This class is used when Iometer Configuration Files ## */ +/* ## (ICF files) are being restored. Managers from the ## */ +/* ## file (identified by name and a disambiguating ID ## */ +/* ## number) are mapped to the actual running Managers ## */ +/* ## by the ManagerList at file load time. ## */ +/* ## ## */ +/* ## ------------------------------------------------------------------- ## */ +/* ## ## */ +/* ## Changes ...: 2003-10-17 (daniel.scheibli@edelbyte.org) ## */ +/* ## - Moved to the use of the IOMTR_[OSFAMILY|OS|CPU]_* ## */ +/* ## global defines. ## */ +/* ## - Integrated the License Statement into this header. ## */ +/* ## 2003-04-25 (daniel.scheibli@edelbyte.org) ## */ +/* ## - Updated the global debug flag (_DEBUG) handling ## */ +/* ## of the source file (check for platform etc.). ## */ +/* ## - Added new header holding the changelog. ## */ +/* ## ## */ +/* ######################################################################### */ #ifndef MANAGERMAP_DEFINED #define MANAGERMAP_DEFINED + #include "Manager.h" #include "WaitingForManagers.h" --- MeterCtrl.cpp Sat Oct 18 19:09:33 2003 +++ MeterCtrl.cpp.mod Sat Oct 18 20:50:03 2003 @@ -4,7 +4,45 @@ /* ## ## */ /* ## ------------------------------------------------------------------- ## */ /* ## ## */ -/* ## Job .......: ... ## */ +/* ## Job .......: Implementation of the CMeterCtrl class, which ## */ +/* ## provides the "speedometer" control in the ## */ +/* ## "Presentation Meter" dialog. ## */ +/* ## ## */ +/* ## ------------------------------------------------------------------- ## */ +/* ## ## */ +/* ## Intel Open Source License ## */ +/* ## ## */ +/* ## Copyright (c) 2001 Intel Corporation ## */ +/* ## All rights reserved. ## */ +/* ## Redistribution and use in source and binary forms, with or ## */ +/* ## without modification, are permitted provided that the following ## */ +/* ## conditions are met: ## */ +/* ## ## */ +/* ## Redistributions of source code must retain the above copyright ## */ +/* ## notice, this list of conditions and the following disclaimer. ## */ +/* ## ## */ +/* ## Redistributions in binary form must reproduce the above copyright ## */ +/* ## notice, this list of conditions and the following disclaimer in ## */ +/* ## the documentation and/or other materials provided with the ## */ +/* ## distribution. ## */ +/* ## ## */ +/* ## Neither the name of the Intel Corporation nor the names of its ## */ +/* ## contributors may be used to endorse or promote products derived ## */ +/* ## from this software without specific prior written permission. ## */ +/* ## ## */ +/* ## THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND ## */ +/* ## CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, ## */ +/* ## INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF ## */ +/* ## MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE ## */ +/* ## DISCLAIMED. IN NO EVENT SHALL THE INTEL OR ITS CONTRIBUTORS BE ## */ +/* ## LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, ## */ +/* ## OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, ## */ +/* ## PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, ## */ +/* ## OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY ## */ +/* ## THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR ## */ +/* ## TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT ## */ +/* ## OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY ## */ +/* ## OF SUCH DAMAGE. ## */ /* ## ## */ /* ## ------------------------------------------------------------------- ## */ /* ## ## */ @@ -12,57 +50,16 @@ /* ## ## */ /* ## ------------------------------------------------------------------- ## */ /* ## ## */ -/* ## Changes ...: 2003-04-25 (daniel.scheibli@edelbyte.org) ## */ +/* ## Changes ...: 2003-10-17 (daniel.scheibli@edelbyte.org) ## */ +/* ## - Moved to the use of the IOMTR_[OSFAMILY|OS|CPU]_* ## */ +/* ## global defines. ## */ +/* ## - Integrated the License Statement into this header. ## */ +/* ## 2003-04-25 (daniel.scheibli@edelbyte.org) ## */ /* ## - Updated the global debug flag (_DEBUG) handling ## */ /* ## of the source file (check for platform etc.). ## */ /* ## - Added new header holding the changelog. ## */ /* ## ## */ /* ######################################################################### */ -/* -Intel Open Source License - -Copyright (c) 2001 Intel Corporation -All rights reserved. -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: - - Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimer. - - Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - - Neither the name of the Intel Corporation nor the names of its contributors - may be used to endorse or promote products derived from this software - without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ``AS IS'' -AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -ARE DISCLAIMED. IN NO EVENT SHALL THE INTEL OR ITS CONTRIBUTORS BE LIABLE -FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE -USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -*/ -// ========================================================================== -// Copyright (C) 1997-2000 Intel Corporation -// All rights reserved -// INTEL CORPORATION PROPRIETARY INFORMATION -// This software is supplied under the terms of a license agreement or -// nondisclosure agreement with Intel Corporation and may not be copied -// or disclosed except in accordance with the terms of that agreement. -// ========================================================================== -// -// MeterCtrl.cpp: Implementation of the CMeterCtrl class, which provides the -// "speedometer" control in the "Presentation Meter" dialog. -// -////////////////////////////////////////////////////////////////////// -/* ######################################################################### */ #include @@ -80,12 +77,12 @@ // will be a MFC hacker who could advice here. // [1] = http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vclib/html/_mfc_debug_new.asp // -#if defined (_WIN32) || defined (_WIN64) -#ifdef _DEBUG -#define new DEBUG_NEW -#undef THIS_FILE -static char THIS_FILE[] = __FILE__; -#endif +#if defined(IOMTR_OS_WIN32) || defined(IOMTR_OS_WIN64) + #ifdef _DEBUG + #define new DEBUG_NEW + #undef THIS_FILE + static char THIS_FILE[] = __FILE__; + #endif #endif --- MeterCtrl.h Sat Oct 18 19:09:33 2003 +++ MeterCtrl.h.mod Sat Oct 18 20:52:05 2003 @@ -1,50 +1,65 @@ -/* -Intel Open Source License - -Copyright (c) 2001 Intel Corporation -All rights reserved. -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: - - Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimer. - - Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - - Neither the name of the Intel Corporation nor the names of its contributors - may be used to endorse or promote products derived from this software - without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ``AS IS'' -AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -ARE DISCLAIMED. IN NO EVENT SHALL THE INTEL OR ITS CONTRIBUTORS BE LIABLE -FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE -USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -*/ -// ========================================================================== -// Copyright (C) 1997-2000 Intel Corporation -// All rights reserved -// INTEL CORPORATION PROPRIETARY INFORMATION -// This software is supplied under the terms of a license agreement or -// nondisclosure agreement with Intel Corporation and may not be copied -// or disclosed except in accordance with the terms of that agreement. -// ========================================================================== -// -// MeterCtrl.h: Interface for the CMeterCtrl class, which provides the -// "speedometer" control in the "Presentation Meter" dialog. -// -////////////////////////////////////////////////////////////////////// - +/* ######################################################################### */ +/* ## ## */ +/* ## (Iometer) / MeterCtrl.h ## */ +/* ## ## */ +/* ## ------------------------------------------------------------------- ## */ +/* ## ## */ +/* ## Job .......: Interface for the CMeterCtrl class, which provides ## */ +/* ## the "speedometer" control in the "Presentation Meter" ## */ +/* ## dialog. ## */ +/* ## ## */ +/* ## ------------------------------------------------------------------- ## */ +/* ## ## */ +/* ## Intel Open Source License ## */ +/* ## ## */ +/* ## Copyright (c) 2001 Intel Corporation ## */ +/* ## All rights reserved. ## */ +/* ## Redistribution and use in source and binary forms, with or ## */ +/* ## without modification, are permitted provided that the following ## */ +/* ## conditions are met: ## */ +/* ## ## */ +/* ## Redistributions of source code must retain the above copyright ## */ +/* ## notice, this list of conditions and the following disclaimer. ## */ +/* ## ## */ +/* ## Redistributions in binary form must reproduce the above copyright ## */ +/* ## notice, this list of conditions and the following disclaimer in ## */ +/* ## the documentation and/or other materials provided with the ## */ +/* ## distribution. ## */ +/* ## ## */ +/* ## Neither the name of the Intel Corporation nor the names of its ## */ +/* ## contributors may be used to endorse or promote products derived ## */ +/* ## from this software without specific prior written permission. ## */ +/* ## ## */ +/* ## THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND ## */ +/* ## CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, ## */ +/* ## INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF ## */ +/* ## MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE ## */ +/* ## DISCLAIMED. IN NO EVENT SHALL THE INTEL OR ITS CONTRIBUTORS BE ## */ +/* ## LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, ## */ +/* ## OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, ## */ +/* ## PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, ## */ +/* ## OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY ## */ +/* ## THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR ## */ +/* ## TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT ## */ +/* ## OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY ## */ +/* ## OF SUCH DAMAGE. ## */ +/* ## ## */ +/* ## ------------------------------------------------------------------- ## */ +/* ## ## */ +/* ## Remarks ...: ## */ +/* ## ## */ +/* ## ------------------------------------------------------------------- ## */ +/* ## ## */ +/* ## Changes ...: 2003-10-17 (daniel.scheibli@edelbyte.org) ## */ +/* ## - Moved to the use of the IOMTR_[OSFAMILY|OS|CPU]_* ## */ +/* ## global defines. ## */ +/* ## - Integrated the License Statement into this header. ## */ +/* ## - Added new header holding the changelog. ## */ +/* ## ## */ +/* ######################################################################### */ #ifndef METERCTRL_DEFINED #define METERCTRL_DEFINED + #include "TextDisplay.h" --- Network.cpp Sat Jul 19 10:22:27 2003 +++ Network.cpp.mod Sat Oct 18 22:35:47 2003 @@ -4,78 +4,76 @@ /* ## ## */ /* ## ------------------------------------------------------------------- ## */ /* ## ## */ -/* ## Job .......: This class covers the communication between network ## */ -/* ## workers in Dynamo. ## */ +/* ## Job .......: Implementation of generic methods for the Network ## */ +/* ## class. Network is a pure virtual class that is used ## */ +/* ## as a base class for any network connection. It does ## */ +/* ## not contain any code except for the utility function ## */ +/* ## OutputErrMsg(). ## */ /* ## ## */ /* ## ------------------------------------------------------------------- ## */ /* ## ## */ -/* ## Remarks ...: ## */ +/* ## Intel Open Source License ## */ +/* ## ## */ +/* ## Copyright (c) 2001 Intel Corporation ## */ +/* ## All rights reserved. ## */ +/* ## Redistribution and use in source and binary forms, with or ## */ +/* ## without modification, are permitted provided that the following ## */ +/* ## conditions are met: ## */ +/* ## ## */ +/* ## Redistributions of source code must retain the above copyright ## */ +/* ## notice, this list of conditions and the following disclaimer. ## */ +/* ## ## */ +/* ## Redistributions in binary form must reproduce the above copyright ## */ +/* ## notice, this list of conditions and the following disclaimer in ## */ +/* ## the documentation and/or other materials provided with the ## */ +/* ## distribution. ## */ +/* ## ## */ +/* ## Neither the name of the Intel Corporation nor the names of its ## */ +/* ## contributors may be used to endorse or promote products derived ## */ +/* ## from this software without specific prior written permission. ## */ +/* ## ## */ +/* ## THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND ## */ +/* ## CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, ## */ +/* ## INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF ## */ +/* ## MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE ## */ +/* ## DISCLAIMED. IN NO EVENT SHALL THE INTEL OR ITS CONTRIBUTORS BE ## */ +/* ## LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, ## */ +/* ## OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, ## */ +/* ## PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, ## */ +/* ## OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY ## */ +/* ## THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR ## */ +/* ## TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT ## */ +/* ## OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY ## */ +/* ## OF SUCH DAMAGE. ## */ /* ## ## */ /* ## ------------------------------------------------------------------- ## */ /* ## ## */ -/* ## Changes ...: 2003-02-15 (daniel.scheibli@edelbyte.org) ## */ +/* ## Remarks ...: - Network objects are used for connections between ## */ +/* ## network workers in Dynamo (contrast Port, which is ## */ +/* ## used for communication between Dynamo and Iometer). ## */ +/* ## The Network class was designed for use in both ## */ +/* ## Iometer and Dynamo, but is currently used only in ## */ +/* ## Dynamo. ## */ +/* ## ## */ +/* ## ------------------------------------------------------------------- ## */ +/* ## ## */ +/* ## Changes ...: 2003-10-17 (daniel.scheibli@edelbyte.org) ## */ +/* ## - Moved to the use of the IOMTR_[OSFAMILY|OS|CPU]_* ## */ +/* ## global defines. ## */ +/* ## - Integrated the License Statement into this header. ## */ +/* ## 2003-02-15 (daniel.scheibli@edelbyte.org) ## */ /* ## - Added new header holding the changelog. ## */ /* ## - Different changes to support compilation with ## */ /* ## gcc 3.2 (known as cout << hex error). ## */ /* ## ## */ /* ######################################################################### */ -/* -Intel Open Source License -Copyright (c) 2001 Intel Corporation -All rights reserved. -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: - - Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimer. - - Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - - Neither the name of the Intel Corporation nor the names of its contributors - may be used to endorse or promote products derived from this software - without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ``AS IS'' -AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -ARE DISCLAIMED. IN NO EVENT SHALL THE INTEL OR ITS CONTRIBUTORS BE LIABLE -FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE -USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -*/ -// ========================================================================== -// Copyright (C) 1997-2000 Intel Corporation -// All rights reserved -// INTEL CORPORATION PROPRIETARY INFORMATION -// This software is supplied under the terms of a license agreement or -// nondisclosure agreement with Intel Corporation and may not be copied -// or disclosed except in accordance with the terms of that agreement. -// ========================================================================== -// -// Network.cpp: Implementation of generic methods for the Network class. -// Network is a pure virtual class that is used as a base class for -// any network connection. It does not contain any code except for the -// utility function OutputErrMsg(). -// -// Network objects are used for connections between network workers -// in Dynamo (contrast Port, which is used for communication between -// Dynamo and Iometer). The Network class was designed for use in -// both Iometer and Dynamo, but is currently used only in Dynamo. -// -////////////////////////////////////////////////////////////////////// -/* ######################################################################### */ -#if defined (_WIN32) || defined (_WIN64) -#include +#if defined(IOMTR_OS_WIN32) || defined(IOMTR_OS_WIN64) + #include #endif + #include "Network.h" ////////////////////////////////////////////////////////////////////// @@ -106,13 +104,19 @@ *errmsg << "Port::OutputErrMsg() called with invalid errmsg value!" << ends; } -#ifdef _WINDOWS +// TODO: Totally wrong distinction - decission about Message Box +// vs. Output on the console is sometyhing based on ability +// (so running on Windows) AND mode (dialog vs. batch). +#if defined(IOMTR_OSFAMILY_WINDOWS) // Iometer ErrorMessage( errmsg->str().c_str() ); -#else +#elif defined(IOMTR_OSFAMILY_UNIX) // Dynamo cout << errmsg->str() << endl; +#else + #warning ===> WARNING: You have to do some coding here to get the port done! #endif + // str() returns pointer to buffer and freezes it, we must call freeze(FALSE) to // unfreeze the buffer before we can delete the object --- Network.h Sat Jul 19 10:22:27 2003 +++ Network.h.mod Sat Oct 18 21:00:46 2003 @@ -4,75 +4,70 @@ /* ## ## */ /* ## ------------------------------------------------------------------- ## */ /* ## ## */ -/* ## Job .......: Contains the class definition of the Network class, ## */ -/* ## which covers the communication between network ## */ -/* ## workers in Dynamo. ## */ +/* ## Job .......: Interface for the Network class. Network is a pure ## */ +/* ## virtual class that is used as a base class for any ## */ +/* ## network connection. ## */ /* ## ## */ /* ## ------------------------------------------------------------------- ## */ /* ## ## */ -/* ## Remarks ...: ## */ +/* ## Intel Open Source License ## */ +/* ## ## */ +/* ## Copyright (c) 2001 Intel Corporation ## */ +/* ## All rights reserved. ## */ +/* ## Redistribution and use in source and binary forms, with or ## */ +/* ## without modification, are permitted provided that the following ## */ +/* ## conditions are met: ## */ +/* ## ## */ +/* ## Redistributions of source code must retain the above copyright ## */ +/* ## notice, this list of conditions and the following disclaimer. ## */ +/* ## ## */ +/* ## Redistributions in binary form must reproduce the above copyright ## */ +/* ## notice, this list of conditions and the following disclaimer in ## */ +/* ## the documentation and/or other materials provided with the ## */ +/* ## distribution. ## */ +/* ## ## */ +/* ## Neither the name of the Intel Corporation nor the names of its ## */ +/* ## contributors may be used to endorse or promote products derived ## */ +/* ## from this software without specific prior written permission. ## */ +/* ## ## */ +/* ## THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND ## */ +/* ## CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, ## */ +/* ## INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF ## */ +/* ## MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE ## */ +/* ## DISCLAIMED. IN NO EVENT SHALL THE INTEL OR ITS CONTRIBUTORS BE ## */ +/* ## LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, ## */ +/* ## OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, ## */ +/* ## PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, ## */ +/* ## OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY ## */ +/* ## THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR ## */ +/* ## TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT ## */ +/* ## OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY ## */ +/* ## OF SUCH DAMAGE. ## */ +/* ## ## */ +/* ## ------------------------------------------------------------------- ## */ +/* ## ## */ +/* ## Remarks ...: - Network objects are used for connections between ## */ +/* ## network workers in Dynamo (contrast Port, which is ## */ +/* ## used for communication between Dynamo and Iometer). ## */ +/* ## The Network class was designed for use in both ## */ +/* ## Iometer and Dynamo, but is currently used only in ## */ +/* ## Dynamo. ## */ /* ## ## */ /* ## ------------------------------------------------------------------- ## */ /* ## ## */ -/* ## Changes ...: 2003-02-15 (daniel.scheibli@edelbyte.org) ## */ +/* ## Changes ...: 2003-10-17 (daniel.scheibli@edelbyte.org) ## */ +/* ## - Moved to the use of the IOMTR_[OSFAMILY|OS|CPU]_* ## */ +/* ## global defines. ## */ +/* ## - Integrated the License Statement into this header. ## */ +/* ## 2003-02-15 (daniel.scheibli@edelbyte.org) ## */ /* ## - Added new header holding the changelog. ## */ /* ## - Different changes to support compilation with ## */ /* ## gcc 3.2 (known as cout << hex error). ## */ /* ## ## */ /* ######################################################################### */ -/* -Intel Open Source License - -Copyright (c) 2001 Intel Corporation -All rights reserved. -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: - - Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimer. - - Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - - Neither the name of the Intel Corporation nor the names of its contributors - may be used to endorse or promote products derived from this software - without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ``AS IS'' -AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -ARE DISCLAIMED. IN NO EVENT SHALL THE INTEL OR ITS CONTRIBUTORS BE LIABLE -FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE -USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -*/ -// ========================================================================== -// Copyright (C) 1997-2000 Intel Corporation -// All rights reserved -// INTEL CORPORATION PROPRIETARY INFORMATION -// This software is supplied under the terms of a license agreement or -// nondisclosure agreement with Intel Corporation and may not be copied -// or disclosed except in accordance with the terms of that agreement. -// ========================================================================== -// -// Network.h: Interface for the Network class. Network is a pure virtual -// class that is used as a base class for any network connection. -// -// Network objects are used for connections between network workers -// in Dynamo (contrast Port, which is used for communication between -// Dynamo and Iometer). The Network class was designed for use in -// both Iometer and Dynamo, but is currently used only in Dynamo. -// -////////////////////////////////////////////////////////////////////// -/* ######################################################################### */ - #ifndef NETWORK_DEFINED #define NETWORK_DEFINED + #include using namespace std; --- PageAccess.cpp Sat Jul 19 10:22:27 2003 +++ PageAccess.cpp.mod Sat Oct 18 21:55:35 2003 @@ -4,7 +4,45 @@ /* ## ## */ /* ## ------------------------------------------------------------------- ## */ /* ## ## */ -/* ## Job .......: This file implements the Access Specifications tab ## */ +/* ## Job .......: Implementation of the CPageAccess class, which is ## */ +/* ## responsible for the "Access Specifications" tab in ## */ +/* ## Iometer's main window. ## */ +/* ## ## */ +/* ## ------------------------------------------------------------------- ## */ +/* ## ## */ +/* ## Intel Open Source License ## */ +/* ## ## */ +/* ## Copyright (c) 2001 Intel Corporation ## */ +/* ## All rights reserved. ## */ +/* ## Redistribution and use in source and binary forms, with or ## */ +/* ## without modification, are permitted provided that the following ## */ +/* ## conditions are met: ## */ +/* ## ## */ +/* ## Redistributions of source code must retain the above copyright ## */ +/* ## notice, this list of conditions and the following disclaimer. ## */ +/* ## ## */ +/* ## Redistributions in binary form must reproduce the above copyright ## */ +/* ## notice, this list of conditions and the following disclaimer in ## */ +/* ## the documentation and/or other materials provided with the ## */ +/* ## distribution. ## */ +/* ## ## */ +/* ## Neither the name of the Intel Corporation nor the names of its ## */ +/* ## contributors may be used to endorse or promote products derived ## */ +/* ## from this software without specific prior written permission. ## */ +/* ## ## */ +/* ## THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND ## */ +/* ## CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, ## */ +/* ## INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF ## */ +/* ## MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE ## */ +/* ## DISCLAIMED. IN NO EVENT SHALL THE INTEL OR ITS CONTRIBUTORS BE ## */ +/* ## LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, ## */ +/* ## OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, ## */ +/* ## PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, ## */ +/* ## OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY ## */ +/* ## THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR ## */ +/* ## TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT ## */ +/* ## OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY ## */ +/* ## OF SUCH DAMAGE. ## */ /* ## ## */ /* ## ------------------------------------------------------------------- ## */ /* ## ## */ @@ -12,7 +50,11 @@ /* ## ## */ /* ## ------------------------------------------------------------------- ## */ /* ## ## */ -/* ## Changes ...: 2003-04-25 (daniel.scheibli@edelbyte.org) ## */ +/* ## Changes ...: 2003-10-17 (daniel.scheibli@edelbyte.org) ## */ +/* ## - Moved to the use of the IOMTR_[OSFAMILY|OS|CPU]_* ## */ +/* ## global defines. ## */ +/* ## - Integrated the License Statement into this header. ## */ +/* ## 2003-04-25 (daniel.scheibli@edelbyte.org) ## */ /* ## - Updated the global debug flag (_DEBUG) handling ## */ /* ## of the source file (check for platform etc.). ## */ /* ## 2003-03-02 (joe@eiler.net) ## */ @@ -20,51 +62,6 @@ /* ## - Added new header holding the changelog. ## */ /* ## ## */ /* ######################################################################### */ -/* -Intel Open Source License - -Copyright (c) 2001 Intel Corporation -All rights reserved. -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: - - Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimer. - - Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - - Neither the name of the Intel Corporation nor the names of its contributors - may be used to endorse or promote products derived from this software - without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ``AS IS'' -AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -ARE DISCLAIMED. IN NO EVENT SHALL THE INTEL OR ITS CONTRIBUTORS BE LIABLE -FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE -USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -*/ -// ========================================================================== -// Copyright (C) 1997-2000 Intel Corporation -// All rights reserved -// INTEL CORPORATION PROPRIETARY INFORMATION -// This software is supplied under the terms of a license agreement or -// nondisclosure agreement with Intel Corporation and may not be copied -// or disclosed except in accordance with the terms of that agreement. -// ========================================================================== -// -// PageAccess.cpp: Implementation of the CPageAccess class, which is -// responsible for the "Access Specifications" tab in Iometer's main window. -// -////////////////////////////////////////////////////////////////////// -/* ######################################################################### */ #include "stdafx.h" @@ -82,12 +79,12 @@ // will be a MFC hacker who could advice here. // [1] = http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vclib/html/_mfc_debug_new.asp // -#if defined (_WIN32) || defined (_WIN64) -#ifdef _DEBUG -#define new DEBUG_NEW -#undef THIS_FILE -static char THIS_FILE[] = __FILE__; -#endif +#if defined(IOMTR_OS_WIN32) || defined(IOMTR_OS_WIN64) + #ifdef _DEBUG + #define new DEBUG_NEW + #undef THIS_FILE + static char THIS_FILE[] = __FILE__; + #endif #endif --- PageAccess.h Sat Jul 19 10:22:27 2003 +++ PageAccess.h.mod Sat Oct 18 21:04:44 2003 @@ -1,65 +1,80 @@ -/* -Intel Open Source License - -Copyright (c) 2001 Intel Corporation -All rights reserved. -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: - - Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimer. - - Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - - Neither the name of the Intel Corporation nor the names of its contributors - may be used to endorse or promote products derived from this software - without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ``AS IS'' -AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -ARE DISCLAIMED. IN NO EVENT SHALL THE INTEL OR ITS CONTRIBUTORS BE LIABLE -FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE -USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -*/ -// ========================================================================== -// Copyright (C) 1997-2000 Intel Corporation -// All rights reserved -// INTEL CORPORATION PROPRIETARY INFORMATION -// This software is supplied under the terms of a license agreement or -// nondisclosure agreement with Intel Corporation and may not be copied -// or disclosed except in accordance with the terms of that agreement. -// ========================================================================== -// -// PageAccess.h: Interface for the CPageAccess class, which is responsible -// for the "Access Specifications" tab in Iometer's main window. -// -////////////////////////////////////////////////////////////////////// - +/* ######################################################################### */ +/* ## ## */ +/* ## (Iometer) / PageAccess.h ## */ +/* ## ## */ +/* ## ------------------------------------------------------------------- ## */ +/* ## ## */ +/* ## Job .......: Interface for the CPageAccess class, which is ## */ +/* ## responsible for the "Access Specifications" tab in ## */ +/* ## Iometer's main window. ## */ +/* ## ## */ +/* ## ------------------------------------------------------------------- ## */ +/* ## ## */ +/* ## Intel Open Source License ## */ +/* ## ## */ +/* ## Copyright (c) 2001 Intel Corporation ## */ +/* ## All rights reserved. ## */ +/* ## Redistribution and use in source and binary forms, with or ## */ +/* ## without modification, are permitted provided that the following ## */ +/* ## conditions are met: ## */ +/* ## ## */ +/* ## Redistributions of source code must retain the above copyright ## */ +/* ## notice, this list of conditions and the following disclaimer. ## */ +/* ## ## */ +/* ## Redistributions in binary form must reproduce the above copyright ## */ +/* ## notice, this list of conditions and the following disclaimer in ## */ +/* ## the documentation and/or other materials provided with the ## */ +/* ## distribution. ## */ +/* ## ## */ +/* ## Neither the name of the Intel Corporation nor the names of its ## */ +/* ## contributors may be used to endorse or promote products derived ## */ +/* ## from this software without specific prior written permission. ## */ +/* ## ## */ +/* ## THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND ## */ +/* ## CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, ## */ +/* ## INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF ## */ +/* ## MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE ## */ +/* ## DISCLAIMED. IN NO EVENT SHALL THE INTEL OR ITS CONTRIBUTORS BE ## */ +/* ## LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, ## */ +/* ## OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, ## */ +/* ## PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, ## */ +/* ## OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY ## */ +/* ## THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR ## */ +/* ## TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT ## */ +/* ## OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY ## */ +/* ## OF SUCH DAMAGE. ## */ +/* ## ## */ +/* ## ------------------------------------------------------------------- ## */ +/* ## ## */ +/* ## Remarks ...: ## */ +/* ## ## */ +/* ## ------------------------------------------------------------------- ## */ +/* ## ## */ +/* ## Changes ...: 2003-10-17 (daniel.scheibli@edelbyte.org) ## */ +/* ## - Moved to the use of the IOMTR_[OSFAMILY|OS|CPU]_* ## */ +/* ## global defines. ## */ +/* ## - Integrated the License Statement into this header. ## */ +/* ## - Added new header holding the changelog. ## */ +/* ## ## */ +/* ######################################################################### */ #ifndef PAGEACCESS_DEFINED - #define PAGEACCESS_DEFINED +#define PAGEACCESS_DEFINED + #include "GalileoApp.h" #include "IOTest.h" // Info for access spec image list (LED's and default assignment) -#define ACCESS_ICON_SIZE 15 -#define ACCESS_ICON_EXPAND 10 // number of icons to add to ImageList when expanding -#define GLOBAL_ACCESS_ICON_BGCOLOR 0x00ff00ff +#define ACCESS_ICON_SIZE 15 +#define ACCESS_ICON_EXPAND 10 // number of icons to add to ImageList when expanding +#define GLOBAL_ACCESS_ICON_BGCOLOR 0x00ff00ff #define ASSIGNED_ACCESS_ICON_BGCOLOR 0x00ffffff // Color of LED's. (Position of icon in bitmap.) #define RED 0 -#define BLUE 1 -#define GREEN 2 +#define BLUE 1 +#define GREEN 2 // Info for searching in CListCtrls #define NOTHING -1 // Used to compare return values. Indicates nothing is selected. --- PageDisk.cpp Sat Jul 19 10:22:30 2003 +++ PageDisk.cpp.mod Sat Oct 18 21:55:47 2003 @@ -4,7 +4,45 @@ /* ## ## */ /* ## ------------------------------------------------------------------- ## */ /* ## ## */ -/* ## Job .......: This is the Disk Targets tab in Iometer. ## */ +/* ## Job .......: Implementation of the CPageDisk class, which is ## */ +/* ## responsible for the "Disk Targets" tab in Iometer's ## */ +/* ## main window. ## */ +/* ## ## */ +/* ## ------------------------------------------------------------------- ## */ +/* ## ## */ +/* ## Intel Open Source License ## */ +/* ## ## */ +/* ## Copyright (c) 2001 Intel Corporation ## */ +/* ## All rights reserved. ## */ +/* ## Redistribution and use in source and binary forms, with or ## */ +/* ## without modification, are permitted provided that the following ## */ +/* ## conditions are met: ## */ +/* ## ## */ +/* ## Redistributions of source code must retain the above copyright ## */ +/* ## notice, this list of conditions and the following disclaimer. ## */ +/* ## ## */ +/* ## Redistributions in binary form must reproduce the above copyright ## */ +/* ## notice, this list of conditions and the following disclaimer in ## */ +/* ## the documentation and/or other materials provided with the ## */ +/* ## distribution. ## */ +/* ## ## */ +/* ## Neither the name of the Intel Corporation nor the names of its ## */ +/* ## contributors may be used to endorse or promote products derived ## */ +/* ## from this software without specific prior written permission. ## */ +/* ## ## */ +/* ## THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND ## */ +/* ## CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, ## */ +/* ## INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF ## */ +/* ## MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE ## */ +/* ## DISCLAIMED. IN NO EVENT SHALL THE INTEL OR ITS CONTRIBUTORS BE ## */ +/* ## LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, ## */ +/* ## OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, ## */ +/* ## PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, ## */ +/* ## OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY ## */ +/* ## THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR ## */ +/* ## TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT ## */ +/* ## OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY ## */ +/* ## OF SUCH DAMAGE. ## */ /* ## ## */ /* ## ------------------------------------------------------------------- ## */ /* ## ## */ @@ -12,7 +50,11 @@ /* ## ## */ /* ## ------------------------------------------------------------------- ## */ /* ## ## */ -/* ## Changes ...: 2003-04-25 (daniel.scheibli@edelbyte.org) ## */ +/* ## Changes ...: 2003-10-17 (daniel.scheibli@edelbyte.org) ## */ +/* ## - Moved to the use of the IOMTR_[OSFAMILY|OS|CPU]_* ## */ +/* ## global defines. ## */ +/* ## - Integrated the License Statement into this header. ## */ +/* ## 2003-04-25 (daniel.scheibli@edelbyte.org) ## */ /* ## - Updated the global debug flag (_DEBUG) handling ## */ /* ## of the source file (check for platform etc.). ## */ /* ## 2003-03-28 (joe@eiler.net) ## */ @@ -21,51 +63,6 @@ /* ## - added new header info. ## */ /* ## ## */ /* ######################################################################### */ -/* -Intel Open Source License - -Copyright (c) 2001 Intel Corporation -All rights reserved. -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: - - Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimer. - - Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - - Neither the name of the Intel Corporation nor the names of its contributors - may be used to endorse or promote products derived from this software - without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ``AS IS'' -AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -ARE DISCLAIMED. IN NO EVENT SHALL THE INTEL OR ITS CONTRIBUTORS BE LIABLE -FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE -USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -*/ -// ========================================================================== -// Copyright (C) 1997-2000 Intel Corporation -// All rights reserved -// INTEL CORPORATION PROPRIETARY INFORMATION -// This software is supplied under the terms of a license agreement or -// nondisclosure agreement with Intel Corporation and may not be copied -// or disclosed except in accordance with the terms of that agreement. -// ========================================================================== -// -// PageDisk.cpp: Implementation of the CPageDisk class, which is -// responsible for the "Disk Targets" tab in Iometer's main window. -// -////////////////////////////////////////////////////////////////////// -/* ######################################################################### */ #include "stdafx.h" @@ -83,12 +80,12 @@ // will be a MFC hacker who could advice here. // [1] = http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vclib/html/_mfc_debug_new.asp // -#if defined (_WIN32) || defined (_WIN64) -#ifdef _DEBUG -#define new DEBUG_NEW -#undef THIS_FILE -static char THIS_FILE[] = __FILE__; -#endif +#if defined(IOMTR_OS_WIN32) || defined(IOMTR_OS_WIN64) + #ifdef _DEBUG + #define new DEBUG_NEW + #undef THIS_FILE + static char THIS_FILE[] = __FILE__; + #endif #endif --- PageDisk.h Sat Jul 19 10:22:30 2003 +++ PageDisk.h.mod Sat Oct 18 21:09:12 2003 @@ -1,50 +1,65 @@ -/* -Intel Open Source License - -Copyright (c) 2001 Intel Corporation -All rights reserved. -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: - - Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimer. - - Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - - Neither the name of the Intel Corporation nor the names of its contributors - may be used to endorse or promote products derived from this software - without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ``AS IS'' -AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -ARE DISCLAIMED. IN NO EVENT SHALL THE INTEL OR ITS CONTRIBUTORS BE LIABLE -FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE -USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -*/ -// ========================================================================== -// Copyright (C) 1997-2000 Intel Corporation -// All rights reserved -// INTEL CORPORATION PROPRIETARY INFORMATION -// This software is supplied under the terms of a license agreement or -// nondisclosure agreement with Intel Corporation and may not be copied -// or disclosed except in accordance with the terms of that agreement. -// ========================================================================== -// -// PageDisk.h: Interface for the CPageDisk class, which is responsible -// for the "Disk Targets" tab in Iometer's main window. -// -////////////////////////////////////////////////////////////////////// - +/* ######################################################################### */ +/* ## ## */ +/* ## Iometer / PageDisk.h ## */ +/* ## ## */ +/* ## ------------------------------------------------------------------- ## */ +/* ## ## */ +/* ## Job .......: Interface for the CPageDisk class, which is ## */ +/* ## responsible for the "Disk Targets" tab in Iometer's ## */ +/* ## main window. ## */ +/* ## ## */ +/* ## ------------------------------------------------------------------- ## */ +/* ## ## */ +/* ## Intel Open Source License ## */ +/* ## ## */ +/* ## Copyright (c) 2001 Intel Corporation ## */ +/* ## All rights reserved. ## */ +/* ## Redistribution and use in source and binary forms, with or ## */ +/* ## without modification, are permitted provided that the following ## */ +/* ## conditions are met: ## */ +/* ## ## */ +/* ## Redistributions of source code must retain the above copyright ## */ +/* ## notice, this list of conditions and the following disclaimer. ## */ +/* ## ## */ +/* ## Redistributions in binary form must reproduce the above copyright ## */ +/* ## notice, this list of conditions and the following disclaimer in ## */ +/* ## the documentation and/or other materials provided with the ## */ +/* ## distribution. ## */ +/* ## ## */ +/* ## Neither the name of the Intel Corporation nor the names of its ## */ +/* ## contributors may be used to endorse or promote products derived ## */ +/* ## from this software without specific prior written permission. ## */ +/* ## ## */ +/* ## THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND ## */ +/* ## CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, ## */ +/* ## INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF ## */ +/* ## MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE ## */ +/* ## DISCLAIMED. IN NO EVENT SHALL THE INTEL OR ITS CONTRIBUTORS BE ## */ +/* ## LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, ## */ +/* ## OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, ## */ +/* ## PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, ## */ +/* ## OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY ## */ +/* ## THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR ## */ +/* ## TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT ## */ +/* ## OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY ## */ +/* ## OF SUCH DAMAGE. ## */ +/* ## ## */ +/* ## ------------------------------------------------------------------- ## */ +/* ## ## */ +/* ## Remarks ...: ## */ +/* ## ## */ +/* ## ------------------------------------------------------------------- ## */ +/* ## ## */ +/* ## Changes ...: 2003-10-17 (daniel.scheibli@edelbyte.org) ## */ +/* ## - Moved to the use of the IOMTR_[OSFAMILY|OS|CPU]_* ## */ +/* ## global defines. ## */ +/* ## - Integrated the License Statement into this header. ## */ +/* ## - added new header info. ## */ +/* ## ## */ +/* ######################################################################### */ #ifndef PAGEDISK_DEFINED - #define PAGEDISK_DEFINED +#define PAGEDISK_DEFINED + ///////////////////////////////////////////////////////////////////////////// // CPageDisk dialog --- PageDisplay.cpp Sat Jul 19 10:22:33 2003 +++ PageDisplay.cpp.mod Sat Oct 18 21:55:57 2003 @@ -4,7 +4,45 @@ /* ## ## */ /* ## ------------------------------------------------------------------- ## */ /* ## ## */ -/* ## Job .......: This is the Results window in Iometer. ## */ +/* ## Job .......: Implementation of the CPageDisplay class, which is ## */ +/* ## responsible for the "Results Display" tab in ## */ +/* ## Iometer's main window. ## */ +/* ## ## */ +/* ## ------------------------------------------------------------------- ## */ +/* ## ## */ +/* ## Intel Open Source License ## */ +/* ## ## */ +/* ## Copyright (c) 2001 Intel Corporation ## */ +/* ## All rights reserved. ## */ +/* ## Redistribution and use in source and binary forms, with or ## */ +/* ## without modification, are permitted provided that the following ## */ +/* ## conditions are met: ## */ +/* ## ## */ +/* ## Redistributions of source code must retain the above copyright ## */ +/* ## notice, this list of conditions and the following disclaimer. ## */ +/* ## ## */ +/* ## Redistributions in binary form must reproduce the above copyright ## */ +/* ## notice, this list of conditions and the following disclaimer in ## */ +/* ## the documentation and/or other materials provided with the ## */ +/* ## distribution. ## */ +/* ## ## */ +/* ## Neither the name of the Intel Corporation nor the names of its ## */ +/* ## contributors may be used to endorse or promote products derived ## */ +/* ## from this software without specific prior written permission. ## */ +/* ## ## */ +/* ## THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND ## */ +/* ## CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, ## */ +/* ## INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF ## */ +/* ## MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE ## */ +/* ## DISCLAIMED. IN NO EVENT SHALL THE INTEL OR ITS CONTRIBUTORS BE ## */ +/* ## LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, ## */ +/* ## OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, ## */ +/* ## PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, ## */ +/* ## OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY ## */ +/* ## THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR ## */ +/* ## TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT ## */ +/* ## OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY ## */ +/* ## OF SUCH DAMAGE. ## */ /* ## ## */ /* ## ------------------------------------------------------------------- ## */ /* ## ## */ @@ -12,7 +50,11 @@ /* ## ## */ /* ## ------------------------------------------------------------------- ## */ /* ## ## */ -/* ## Changes ...: 2003-04-25 (daniel.scheibli@edelbyte.org) ## */ +/* ## Changes ...: 2003-10-17 (daniel.scheibli@edelbyte.org) ## */ +/* ## - Moved to the use of the IOMTR_[OSFAMILY|OS|CPU]_* ## */ +/* ## global defines. ## */ +/* ## - Integrated the License Statement into this header. ## */ +/* ## 2003-04-25 (daniel.scheibli@edelbyte.org) ## */ /* ## - Updated the global debug flag (_DEBUG) handling ## */ /* ## of the source file (check for platform etc.). ## */ /* ## 2003-03-28 (joe@eiler.net) ## */ @@ -21,51 +63,6 @@ /* ## - added new header info. ## */ /* ## ## */ /* ######################################################################### */ -/* -Intel Open Source License - -Copyright (c) 2001 Intel Corporation -All rights reserved. -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: - - Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimer. - - Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - - Neither the name of the Intel Corporation nor the names of its contributors - may be used to endorse or promote products derived from this software - without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ``AS IS'' -AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -ARE DISCLAIMED. IN NO EVENT SHALL THE INTEL OR ITS CONTRIBUTORS BE LIABLE -FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE -USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -*/ -// ========================================================================== -// Copyright (C) 1997-2000 Intel Corporation -// All rights reserved -// INTEL CORPORATION PROPRIETARY INFORMATION -// This software is supplied under the terms of a license agreement or -// nondisclosure agreement with Intel Corporation and may not be copied -// or disclosed except in accordance with the terms of that agreement. -// ========================================================================== -// -// PageDisplay.cpp: Implementation of the CPageDisplay class, which is -// responsible for the "Results Display" tab in Iometer's main window. -// -////////////////////////////////////////////////////////////////////// -/* ######################################################################### */ #include "stdafx.h" @@ -83,12 +80,12 @@ // will be a MFC hacker who could advice here. // [1] = http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vclib/html/_mfc_debug_new.asp // -#if defined (_WIN32) || defined (_WIN64) -#ifdef _DEBUG -#define new DEBUG_NEW -#undef THIS_FILE -static char THIS_FILE[] = __FILE__; -#endif +#if defined(IOMTR_OS_WIN32) || defined(IOMTR_OS_WIN64) + #ifdef _DEBUG + #define new DEBUG_NEW + #undef THIS_FILE + static char THIS_FILE[] = __FILE__; + #endif #endif --- PageDisplay.h Sat Jul 19 10:22:33 2003 +++ PageDisplay.h.mod Sat Oct 18 21:14:22 2003 @@ -1,92 +1,108 @@ -/* -Intel Open Source License +/* ######################################################################### */ +/* ## ## */ +/* ## Iometer / PageDisplay.h ## */ +/* ## ## */ +/* ## ------------------------------------------------------------------- ## */ +/* ## ## */ +/* ## Job .......: Interface for the CPageDisplay class, which is ## */ +/* ## responsible for the "Results Display" tab in ## */ +/* ## Iometer's main window. ## */ +/* ## ## */ +/* ## ------------------------------------------------------------------- ## */ +/* ## ## */ +/* ## Intel Open Source License ## */ +/* ## ## */ +/* ## Copyright (c) 2001 Intel Corporation ## */ +/* ## All rights reserved. ## */ +/* ## Redistribution and use in source and binary forms, with or ## */ +/* ## without modification, are permitted provided that the following ## */ +/* ## conditions are met: ## */ +/* ## ## */ +/* ## Redistributions of source code must retain the above copyright ## */ +/* ## notice, this list of conditions and the following disclaimer. ## */ +/* ## ## */ +/* ## Redistributions in binary form must reproduce the above copyright ## */ +/* ## notice, this list of conditions and the following disclaimer in ## */ +/* ## the documentation and/or other materials provided with the ## */ +/* ## distribution. ## */ +/* ## ## */ +/* ## Neither the name of the Intel Corporation nor the names of its ## */ +/* ## contributors may be used to endorse or promote products derived ## */ +/* ## from this software without specific prior written permission. ## */ +/* ## ## */ +/* ## THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND ## */ +/* ## CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, ## */ +/* ## INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF ## */ +/* ## MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE ## */ +/* ## DISCLAIMED. IN NO EVENT SHALL THE INTEL OR ITS CONTRIBUTORS BE ## */ +/* ## LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, ## */ +/* ## OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, ## */ +/* ## PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, ## */ +/* ## OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY ## */ +/* ## THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR ## */ +/* ## TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT ## */ +/* ## OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY ## */ +/* ## OF SUCH DAMAGE. ## */ +/* ## ## */ +/* ## ------------------------------------------------------------------- ## */ +/* ## ## */ +/* ## Remarks ...: ## */ +/* ## ## */ +/* ## ------------------------------------------------------------------- ## */ +/* ## ## */ +/* ## Changes ...: 2003-10-17 (daniel.scheibli@edelbyte.org) ## */ +/* ## - Moved to the use of the IOMTR_[OSFAMILY|OS|CPU]_* ## */ +/* ## global defines. ## */ +/* ## - Integrated the License Statement into this header. ## */ +/* ## - added new header info. ## */ +/* ## ## */ +/* ######################################################################### */ +#ifndef PAGEDISPLAY_DEFINED +#define PAGEDISPLAY_DEFINED -Copyright (c) 2001 Intel Corporation -All rights reserved. -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: - - Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimer. - - Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - - Neither the name of the Intel Corporation nor the names of its contributors - may be used to endorse or promote products derived from this software - without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ``AS IS'' -AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -ARE DISCLAIMED. IN NO EVENT SHALL THE INTEL OR ITS CONTRIBUTORS BE LIABLE -FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE -USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -*/ -// ========================================================================== -// Copyright (C) 1997-2000 Intel Corporation -// All rights reserved -// INTEL CORPORATION PROPRIETARY INFORMATION -// This software is supplied under the terms of a license agreement or -// nondisclosure agreement with Intel Corporation and may not be copied -// or disclosed except in accordance with the terms of that agreement. -// ========================================================================== -// -// PageDisplay.h: Interface for the CPageDisplay class, which is responsible -// for the "Results Display" tab in Iometer's main window. -// -////////////////////////////////////////////////////////////////////// -#ifndef PAGEDISPLAY_DEFINED - #define PAGEDISPLAY_DEFINED ///////////////////////////////////////////////////////////////////////////// // CPageDisplay dialog #include "GalileoApp.h" -#define DISPLAY_TIMER IDD_DISPLAY -#define NUM_STATUS_BARS 6 -#define NUM_UPDATE_TIMES 11 +#define DISPLAY_TIMER IDD_DISPLAY +#define NUM_STATUS_BARS 6 +#define NUM_UPDATE_TIMES 11 // Types of results which may be displayed. -#define ERROR_RESULT 0 -#define READ_ERROR_RESULT 1 -#define WRITE_ERROR_RESULT 2 - -#define IOPS_RESULT 3 -#define READ_IOPS_RESULT 4 -#define WRITE_IOPS_RESULT 5 - -#define MBPS_RESULT 6 -#define READ_MBPS_RESULT 7 -#define WRITE_MBPS_RESULT 8 +#define ERROR_RESULT 0 +#define READ_ERROR_RESULT 1 +#define WRITE_ERROR_RESULT 2 + +#define IOPS_RESULT 3 +#define READ_IOPS_RESULT 4 +#define WRITE_IOPS_RESULT 5 + +#define MBPS_RESULT 6 +#define READ_MBPS_RESULT 7 +#define WRITE_MBPS_RESULT 8 #define CONNECTION_PER_SEC_RESULT 9 #define TRANSACTION_PER_SEC_RESULT 10 -#define MAX_LATENCY_RESULT 11 +#define MAX_LATENCY_RESULT 11 #define MAX_READ_LATENCY_RESULT 12 #define MAX_WRITE_LATENCY_RESULT 13 -#define MAX_TRANSACTION_LATENCY_RESULT 14 -#define MAX_CONNECTION_LATENCY_RESULT 15 +#define MAX_TRANSACTION_LATENCY_RESULT 14 +#define MAX_CONNECTION_LATENCY_RESULT 15 -#define AVG_LATENCY_RESULT 16 +#define AVG_LATENCY_RESULT 16 #define AVG_READ_LATENCY_RESULT 17 #define AVG_WRITE_LATENCY_RESULT 18 -#define AVG_TRANSACTION_LATENCY_RESULT 19 -#define AVG_CONNECTION_LATENCY_RESULT 20 +#define AVG_TRANSACTION_LATENCY_RESULT 19 +#define AVG_CONNECTION_LATENCY_RESULT 20 #define CPU_UTILIZATION_RESULT 21 #define USER_UTILIZATION_RESULT 22 -#define PRIVILEGED_UTILIZATION_RESULT 23 +#define PRIVILEGED_UTILIZATION_RESULT 23 #define DPC_UTILIZATION_RESULT 24 #define IRQ_UTILIZATION_RESULT 25 @@ -94,11 +110,11 @@ #define CPU_EFFECTIVENESS_RESULT 27 -#define NI_PACKET_RESULT 28 -#define NI_ERROR_RESULT 29 -#define TCP_SEGMENT_RESULT 30 +#define NI_PACKET_RESULT 28 +#define NI_ERROR_RESULT 29 +#define TCP_SEGMENT_RESULT 30 -#define NUM_RESULTS 31 +#define NUM_RESULTS 31 // Submenu codes for the IDR_POPUP_DISPLAY_LIST pop-up menu --- PageNetwork.cpp Sat Jul 19 10:22:33 2003 +++ PageNetwork.cpp.mod Sat Oct 18 21:56:08 2003 @@ -4,7 +4,45 @@ /* ## ## */ /* ## ------------------------------------------------------------------- ## */ /* ## ## */ -/* ## Job .......: This is the Network Targets window in Iometer. ## */ +/* ## Job .......: Implementation of the CPageNetwork class, which is ## */ +/* ## responsible for the "Network Targets" tab in ## */ +/* ## Iometer's main window. ## */ +/* ## ## */ +/* ## ------------------------------------------------------------------- ## */ +/* ## ## */ +/* ## Intel Open Source License ## */ +/* ## ## */ +/* ## Copyright (c) 2001 Intel Corporation ## */ +/* ## All rights reserved. ## */ +/* ## Redistribution and use in source and binary forms, with or ## */ +/* ## without modification, are permitted provided that the following ## */ +/* ## conditions are met: ## */ +/* ## ## */ +/* ## Redistributions of source code must retain the above copyright ## */ +/* ## notice, this list of conditions and the following disclaimer. ## */ +/* ## ## */ +/* ## Redistributions in binary form must reproduce the above copyright ## */ +/* ## notice, this list of conditions and the following disclaimer in ## */ +/* ## the documentation and/or other materials provided with the ## */ +/* ## distribution. ## */ +/* ## ## */ +/* ## Neither the name of the Intel Corporation nor the names of its ## */ +/* ## contributors may be used to endorse or promote products derived ## */ +/* ## from this software without specific prior written permission. ## */ +/* ## ## */ +/* ## THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND ## */ +/* ## CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, ## */ +/* ## INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF ## */ +/* ## MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE ## */ +/* ## DISCLAIMED. IN NO EVENT SHALL THE INTEL OR ITS CONTRIBUTORS BE ## */ +/* ## LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, ## */ +/* ## OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, ## */ +/* ## PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, ## */ +/* ## OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY ## */ +/* ## THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR ## */ +/* ## TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT ## */ +/* ## OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY ## */ +/* ## OF SUCH DAMAGE. ## */ /* ## ## */ /* ## ------------------------------------------------------------------- ## */ /* ## ## */ @@ -12,7 +50,11 @@ /* ## ## */ /* ## ------------------------------------------------------------------- ## */ /* ## ## */ -/* ## Changes ...: 2003-04-25 (daniel.scheibli@edelbyte.org) ## */ +/* ## Changes ...: 2003-10-17 (daniel.scheibli@edelbyte.org) ## */ +/* ## - Moved to the use of the IOMTR_[OSFAMILY|OS|CPU]_* ## */ +/* ## global defines. ## */ +/* ## - Integrated the License Statement into this header. ## */ +/* ## 2003-04-25 (daniel.scheibli@edelbyte.org) ## */ /* ## - Updated the global debug flag (_DEBUG) handling ## */ /* ## of the source file (check for platform etc.). ## */ /* ## 2003-03-28 (joe@eiler.net) ## */ @@ -21,51 +63,6 @@ /* ## - added new header info. ## */ /* ## ## */ /* ######################################################################### */ -/* -Intel Open Source License - -Copyright (c) 2001 Intel Corporation -All rights reserved. -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: - - Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimer. - - Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - - Neither the name of the Intel Corporation nor the names of its contributors - may be used to endorse or promote products derived from this software - without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ``AS IS'' -AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -ARE DISCLAIMED. IN NO EVENT SHALL THE INTEL OR ITS CONTRIBUTORS BE LIABLE -FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE -USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -*/ -// ========================================================================== -// Copyright (C) 1997-2000 Intel Corporation -// All rights reserved -// INTEL CORPORATION PROPRIETARY INFORMATION -// This software is supplied under the terms of a license agreement or -// nondisclosure agreement with Intel Corporation and may not be copied -// or disclosed except in accordance with the terms of that agreement. -// ========================================================================== -// -// PageNetwork.cpp: Implementation of the CPageNetwork class, which is -// responsible for the "Network Targets" tab in Iometer's main window. -// -////////////////////////////////////////////////////////////////////// -/* ######################################################################### */ #include "stdafx.h" @@ -82,12 +79,12 @@ // will be a MFC hacker who could advice here. // [1] = http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vclib/html/_mfc_debug_new.asp // -#if defined (_WIN32) || defined (_WIN64) -#ifdef _DEBUG -#define new DEBUG_NEW -#undef THIS_FILE -static char THIS_FILE[] = __FILE__; -#endif +#if defined(IOMTR_OS_WIN32) || defined(IOMTR_OS_WIN64) + #ifdef _DEBUG + #define new DEBUG_NEW + #undef THIS_FILE + static char THIS_FILE[] = __FILE__; + #endif #endif --- PageNetwork.h Sat Jul 19 10:22:36 2003 +++ PageNetwork.h.mod Sat Oct 18 21:18:41 2003 @@ -1,50 +1,65 @@ -/* -Intel Open Source License - -Copyright (c) 2001 Intel Corporation -All rights reserved. -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: - - Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimer. - - Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - - Neither the name of the Intel Corporation nor the names of its contributors - may be used to endorse or promote products derived from this software - without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ``AS IS'' -AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -ARE DISCLAIMED. IN NO EVENT SHALL THE INTEL OR ITS CONTRIBUTORS BE LIABLE -FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE -USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -*/ -// ========================================================================== -// Copyright (C) 1997-2000 Intel Corporation -// All rights reserved -// INTEL CORPORATION PROPRIETARY INFORMATION -// This software is supplied under the terms of a license agreement or -// nondisclosure agreement with Intel Corporation and may not be copied -// or disclosed except in accordance with the terms of that agreement. -// ========================================================================== -// -// PageNetwork.h: Interface for the CPageNetwork class, which is responsible -// for the "Network Targets" tab in Iometer's main window. -// -////////////////////////////////////////////////////////////////////// - +/* ######################################################################### */ +/* ## ## */ +/* ## Iometer / PageNetwork.h ## */ +/* ## ## */ +/* ## ------------------------------------------------------------------- ## */ +/* ## ## */ +/* ## Job .......: Interface for the CPageNetwork class, which is ## */ +/* ## responsible for the "Network Targets" tab in ## */ +/* ## Iometer's main window. ## */ +/* ## ## */ +/* ## ------------------------------------------------------------------- ## */ +/* ## ## */ +/* ## Intel Open Source License ## */ +/* ## ## */ +/* ## Copyright (c) 2001 Intel Corporation ## */ +/* ## All rights reserved. ## */ +/* ## Redistribution and use in source and binary forms, with or ## */ +/* ## without modification, are permitted provided that the following ## */ +/* ## conditions are met: ## */ +/* ## ## */ +/* ## Redistributions of source code must retain the above copyright ## */ +/* ## notice, this list of conditions and the following disclaimer. ## */ +/* ## ## */ +/* ## Redistributions in binary form must reproduce the above copyright ## */ +/* ## notice, this list of conditions and the following disclaimer in ## */ +/* ## the documentation and/or other materials provided with the ## */ +/* ## distribution. ## */ +/* ## ## */ +/* ## Neither the name of the Intel Corporation nor the names of its ## */ +/* ## contributors may be used to endorse or promote products derived ## */ +/* ## from this software without specific prior written permission. ## */ +/* ## ## */ +/* ## THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND ## */ +/* ## CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, ## */ +/* ## INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF ## */ +/* ## MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE ## */ +/* ## DISCLAIMED. IN NO EVENT SHALL THE INTEL OR ITS CONTRIBUTORS BE ## */ +/* ## LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, ## */ +/* ## OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, ## */ +/* ## PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, ## */ +/* ## OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY ## */ +/* ## THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR ## */ +/* ## TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT ## */ +/* ## OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY ## */ +/* ## OF SUCH DAMAGE. ## */ +/* ## ## */ +/* ## ------------------------------------------------------------------- ## */ +/* ## ## */ +/* ## Remarks ...: ## */ +/* ## ## */ +/* ## ------------------------------------------------------------------- ## */ +/* ## ## */ +/* ## Changes ...: 2003-10-17 (daniel.scheibli@edelbyte.org) ## */ +/* ## - Moved to the use of the IOMTR_[OSFAMILY|OS|CPU]_* ## */ +/* ## global defines. ## */ +/* ## - Integrated the License Statement into this header. ## */ +/* ## - added new header info. ## */ +/* ## ## */ +/* ######################################################################### */ #ifndef PAGENETWORK_DEFINED - #define PAGENETWORK_DEFINED +#define PAGENETWORK_DEFINED + #if _MSC_VER >= 1000 #pragma once --- PageSetup.cpp Sat Jul 19 10:22:36 2003 +++ PageSetup.cpp.mod Sat Oct 18 22:42:43 2003 @@ -4,7 +4,45 @@ /* ## ## */ /* ## ------------------------------------------------------------------- ## */ /* ## ## */ -/* ## Job .......: ... ## */ +/* ## Job .......: Implementation of the CPageSetup class, which is ## */ +/* ## responsible for the "Test Setup" tab in Iometer's ## */ +/* ## main window. ## */ +/* ## ## */ +/* ## ------------------------------------------------------------------- ## */ +/* ## ## */ +/* ## Intel Open Source License ## */ +/* ## ## */ +/* ## Copyright (c) 2001 Intel Corporation ## */ +/* ## All rights reserved. ## */ +/* ## Redistribution and use in source and binary forms, with or ## */ +/* ## without modification, are permitted provided that the following ## */ +/* ## conditions are met: ## */ +/* ## ## */ +/* ## Redistributions of source code must retain the above copyright ## */ +/* ## notice, this list of conditions and the following disclaimer. ## */ +/* ## ## */ +/* ## Redistributions in binary form must reproduce the above copyright ## */ +/* ## notice, this list of conditions and the following disclaimer in ## */ +/* ## the documentation and/or other materials provided with the ## */ +/* ## distribution. ## */ +/* ## ## */ +/* ## Neither the name of the Intel Corporation nor the names of its ## */ +/* ## contributors may be used to endorse or promote products derived ## */ +/* ## from this software without specific prior written permission. ## */ +/* ## ## */ +/* ## THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND ## */ +/* ## CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, ## */ +/* ## INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF ## */ +/* ## MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE ## */ +/* ## DISCLAIMED. IN NO EVENT SHALL THE INTEL OR ITS CONTRIBUTORS BE ## */ +/* ## LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, ## */ +/* ## OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, ## */ +/* ## PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, ## */ +/* ## OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY ## */ +/* ## THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR ## */ +/* ## TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT ## */ +/* ## OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY ## */ +/* ## OF SUCH DAMAGE. ## */ /* ## ## */ /* ## ------------------------------------------------------------------- ## */ /* ## ## */ @@ -12,7 +50,11 @@ /* ## ## */ /* ## ------------------------------------------------------------------- ## */ /* ## ## */ -/* ## Changes ...: 2003-05-07 (daniel.scheibli@edelbyte.org) ## */ +/* ## Changes ...: 2003-10-17 (daniel.scheibli@edelbyte.org) ## */ +/* ## - Moved to the use of the IOMTR_[OSFAMILY|OS|CPU]_* ## */ +/* ## global defines. ## */ +/* ## - Integrated the License Statement into this header. ## */ +/* ## 2003-05-07 (daniel.scheibli@edelbyte.org) ## */ /* ## - Modified output of the current timestamp to ## */ /* ## contain milliseconds as well. ## */ /* ## 2003-04-25 (daniel.scheibli@edelbyte.org) ## */ @@ -21,51 +63,6 @@ /* ## - Added new header holding the changelog. ## */ /* ## ## */ /* ######################################################################### */ -/* -Intel Open Source License - -Copyright (c) 2001 Intel Corporation -All rights reserved. -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: - - Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimer. - - Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - - Neither the name of the Intel Corporation nor the names of its contributors - may be used to endorse or promote products derived from this software - without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ``AS IS'' -AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -ARE DISCLAIMED. IN NO EVENT SHALL THE INTEL OR ITS CONTRIBUTORS BE LIABLE -FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE -USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -*/ -// ========================================================================== -// Copyright (C) 1997-2000 Intel Corporation -// All rights reserved -// INTEL CORPORATION PROPRIETARY INFORMATION -// This software is supplied under the terms of a license agreement or -// nondisclosure agreement with Intel Corporation and may not be copied -// or disclosed except in accordance with the terms of that agreement. -// ========================================================================== -// -// PageSetup.cpp: Implementation of the CPageSetup class, which is -// responsible for the "Test Setup" tab in Iometer's main window. -// -////////////////////////////////////////////////////////////////////// -/* ######################################################################### */ #include "stdafx.h" @@ -82,12 +79,12 @@ // will be a MFC hacker who could advice here. // [1] = http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vclib/html/_mfc_debug_new.asp // -#if defined (_WIN32) || defined (_WIN64) -#ifdef _DEBUG -#define new DEBUG_NEW -#undef THIS_FILE -static char THIS_FILE[] = __FILE__; -#endif +#if defined(IOMTR_OS_WIN32) || defined(IOMTR_OS_WIN64) + #ifdef _DEBUG + #define new DEBUG_NEW + #undef THIS_FILE + static char THIS_FILE[] = __FILE__; + #endif #endif --- PageSetup.h Sat Jul 19 10:22:36 2003 +++ PageSetup.h.mod Sat Oct 18 17:17:07 2003 @@ -1,50 +1,65 @@ -/* -Intel Open Source License - -Copyright (c) 2001 Intel Corporation -All rights reserved. -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: - - Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimer. - - Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - - Neither the name of the Intel Corporation nor the names of its contributors - may be used to endorse or promote products derived from this software - without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ``AS IS'' -AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -ARE DISCLAIMED. IN NO EVENT SHALL THE INTEL OR ITS CONTRIBUTORS BE LIABLE -FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE -USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -*/ -// ========================================================================== -// Copyright (C) 1997-2000 Intel Corporation -// All rights reserved -// INTEL CORPORATION PROPRIETARY INFORMATION -// This software is supplied under the terms of a license agreement or -// nondisclosure agreement with Intel Corporation and may not be copied -// or disclosed except in accordance with the terms of that agreement. -// ========================================================================== -// -// PageSetup.h: Interface for the CPageSetup class, which is responsible -// for the "Test Setup" tab in Iometer's main window. -// -////////////////////////////////////////////////////////////////////// - +/* ######################################################################### */ +/* ## ## */ +/* ## (Iometer) / PageSetup.h ## */ +/* ## ## */ +/* ## ------------------------------------------------------------------- ## */ +/* ## ## */ +/* ## Job .......: Interface for the CPageSetup class, which is ## */ +/* ## responsible for the "Test Setup" tab in Iometer's ## */ +/* ## main window. ## */ +/* ## ## */ +/* ## ------------------------------------------------------------------- ## */ +/* ## ## */ +/* ## Intel Open Source License ## */ +/* ## ## */ +/* ## Copyright (c) 2001 Intel Corporation ## */ +/* ## All rights reserved. ## */ +/* ## Redistribution and use in source and binary forms, with or ## */ +/* ## without modification, are permitted provided that the following ## */ +/* ## conditions are met: ## */ +/* ## ## */ +/* ## Redistributions of source code must retain the above copyright ## */ +/* ## notice, this list of conditions and the following disclaimer. ## */ +/* ## ## */ +/* ## Redistributions in binary form must reproduce the above copyright ## */ +/* ## notice, this list of conditions and the following disclaimer in ## */ +/* ## the documentation and/or other materials provided with the ## */ +/* ## distribution. ## */ +/* ## ## */ +/* ## Neither the name of the Intel Corporation nor the names of its ## */ +/* ## contributors may be used to endorse or promote products derived ## */ +/* ## from this software without specific prior written permission. ## */ +/* ## ## */ +/* ## THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND ## */ +/* ## CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, ## */ +/* ## INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF ## */ +/* ## MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE ## */ +/* ## DISCLAIMED. IN NO EVENT SHALL THE INTEL OR ITS CONTRIBUTORS BE ## */ +/* ## LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, ## */ +/* ## OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, ## */ +/* ## PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, ## */ +/* ## OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY ## */ +/* ## THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR ## */ +/* ## TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT ## */ +/* ## OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY ## */ +/* ## OF SUCH DAMAGE. ## */ +/* ## ## */ +/* ## ------------------------------------------------------------------- ## */ +/* ## ## */ +/* ## Remarks ...: ## */ +/* ## ## */ +/* ## ------------------------------------------------------------------- ## */ +/* ## ## */ +/* ## Changes ...: 2003-10-17 (daniel.scheibli@edelbyte.org) ## */ +/* ## - Moved to the use of the IOMTR_[OSFAMILY|OS|CPU]_* ## */ +/* ## global defines. ## */ +/* ## - Integrated the License Statement into this header. ## */ +/* ## - Added new header holding the changelog. ## */ +/* ## ## */ +/* ######################################################################### */ #ifndef PAGESETUP_DEFINED #define PAGESETUP_DEFINED + ///////////////////////////////////////////////////////////////////////////// // CPageSetup dialog --- PageTarget.h Sat Jul 19 10:22:36 2003 +++ PageTarget.h.mod Sat Oct 18 21:21:56 2003 @@ -1,76 +1,90 @@ -/* -Intel Open Source License - -Copyright (c) 2001 Intel Corporation -All rights reserved. -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: - - Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimer. - - Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - - Neither the name of the Intel Corporation nor the names of its contributors - may be used to endorse or promote products derived from this software - without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ``AS IS'' -AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -ARE DISCLAIMED. IN NO EVENT SHALL THE INTEL OR ITS CONTRIBUTORS BE LIABLE -FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE -USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -*/ -// ========================================================================== -// Copyright (C) 1997-2000 Intel Corporation -// All rights reserved -// INTEL CORPORATION PROPRIETARY INFORMATION -// This software is supplied under the terms of a license agreement or -// nondisclosure agreement with Intel Corporation and may not be copied -// or disclosed except in accordance with the terms of that agreement. -// ========================================================================== -// -// PageTarget.h: Common defines for both PageDisk and PageNetwork. -// -////////////////////////////////////////////////////////////////////// - +/* ######################################################################### */ +/* ## ## */ +/* ## Iometer / PageTarget.h ## */ +/* ## ## */ +/* ## ------------------------------------------------------------------- ## */ +/* ## ## */ +/* ## Job .......: Common defines for both PageDisk and PageNetwork. ## */ +/* ## ## */ +/* ## ------------------------------------------------------------------- ## */ +/* ## ## */ +/* ## Intel Open Source License ## */ +/* ## ## */ +/* ## Copyright (c) 2001 Intel Corporation ## */ +/* ## All rights reserved. ## */ +/* ## Redistribution and use in source and binary forms, with or ## */ +/* ## without modification, are permitted provided that the following ## */ +/* ## conditions are met: ## */ +/* ## ## */ +/* ## Redistributions of source code must retain the above copyright ## */ +/* ## notice, this list of conditions and the following disclaimer. ## */ +/* ## ## */ +/* ## Redistributions in binary form must reproduce the above copyright ## */ +/* ## notice, this list of conditions and the following disclaimer in ## */ +/* ## the documentation and/or other materials provided with the ## */ +/* ## distribution. ## */ +/* ## ## */ +/* ## Neither the name of the Intel Corporation nor the names of its ## */ +/* ## contributors may be used to endorse or promote products derived ## */ +/* ## from this software without specific prior written permission. ## */ +/* ## ## */ +/* ## THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND ## */ +/* ## CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, ## */ +/* ## INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF ## */ +/* ## MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE ## */ +/* ## DISCLAIMED. IN NO EVENT SHALL THE INTEL OR ITS CONTRIBUTORS BE ## */ +/* ## LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, ## */ +/* ## OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, ## */ +/* ## PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, ## */ +/* ## OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY ## */ +/* ## THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR ## */ +/* ## TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT ## */ +/* ## OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY ## */ +/* ## OF SUCH DAMAGE. ## */ +/* ## ## */ +/* ## ------------------------------------------------------------------- ## */ +/* ## ## */ +/* ## Remarks ...: ## */ +/* ## ## */ +/* ## ------------------------------------------------------------------- ## */ +/* ## ## */ +/* ## Changes ...: 2003-10-17 (daniel.scheibli@edelbyte.org) ## */ +/* ## - Moved to the use of the IOMTR_[OSFAMILY|OS|CPU]_* ## */ +/* ## global defines. ## */ +/* ## - Integrated the License Statement into this header. ## */ +/* ## - Added new header holding the changelog. ## */ +/* ## ## */ +/* ######################################################################### */ #ifndef PAGETARGET_DEFINED - #define PAGETARGET_DEFINED +#define PAGETARGET_DEFINED + // indexes for selection updates to make recursive updates easier to do // for the manager list up through the workers. -#define TARGETS 0 -#define DISK_SIZE 1 -#define DISK_START 2 -#define QUEUE_DEPTH 3 -#define NET_ADDRESS 4 +#define TARGETS 0 +#define DISK_SIZE 1 +#define DISK_START 2 +#define QUEUE_DEPTH 3 +#define NET_ADDRESS 4 #define CONNECTION_RATE 5 #define TRANS_PER_CONN 6 // Info for Targets image list -#define TARGET_ICON_SIZE 16 -#define TARGET_ICON_EXPAND 10 // number of icons to add to ImageList when expanding -#define TARGET_ICON_BGCOLOR 0x00ffffff +#define TARGET_ICON_SIZE 16 +#define TARGET_ICON_EXPAND 10 // number of icons to add to ImageList when expanding +#define TARGET_ICON_BGCOLOR 0x00ffffff // Icons for Targets pane (position of icon in bitmap) #define TARGET_ICON_LOGDISK_PREPARED 0 #define TARGET_ICON_LOGDISK_UNPREPARED 1 -#define TARGET_ICON_PHYSDISK 2 -#define TARGET_ICON_MANAGER 3 -#define TARGET_ICON_NETWORK 4 +#define TARGET_ICON_PHYSDISK 2 +#define TARGET_ICON_MANAGER 3 +#define TARGET_ICON_NETWORK 4 // State images for Targets pane (position of icon in bitmap -- we use a single bitmap for both) -#define TARGET_STATE_CHECKED 5 -#define TARGET_STATE_UNCHECKED 6 -#define TARGET_STATE_UNKNOWN 7 +#define TARGET_STATE_CHECKED 5 +#define TARGET_STATE_UNCHECKED 6 +#define TARGET_STATE_UNKNOWN 7 // Inverse of INDEXTOSTATEIMAGEMASK(). (Windows doesn't define this, but it should...) #define STATEIMAGEMASKTOINDEX(i) ((i) >> 12) @@ -78,8 +92,8 @@ enum TargetSelType { TargetUnChecked = TARGET_STATE_UNCHECKED, - TargetChecked = TARGET_STATE_CHECKED, - TargetGrayed = TARGET_STATE_UNKNOWN, + TargetChecked = TARGET_STATE_CHECKED, + TargetGrayed = TARGET_STATE_UNKNOWN, }; #endif --- Pulsar.rc Sat Jul 19 10:22:39 2003 +++ Pulsar.rc.mod Sat Oct 18 23:08:29 2003 @@ -1,34 +1,60 @@ -/* -Intel Open Source License - -Copyright (c) 2001 Intel Corporation -All rights reserved. -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: - - Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimer. - - Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - - Neither the name of the Intel Corporation nor the names of its contributors - may be used to endorse or promote products derived from this software - without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ``AS IS'' -AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -ARE DISCLAIMED. IN NO EVENT SHALL THE INTEL OR ITS CONTRIBUTORS BE LIABLE -FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE -USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -*/ +/* ######################################################################### */ +/* ## ## */ +/* ## Iometer / Pulsar.rc ## */ +/* ## ## */ +/* ## ------------------------------------------------------------------- ## */ +/* ## ## */ +/* ## Job .......: ... ## */ +/* ## ## */ +/* ## ------------------------------------------------------------------- ## */ +/* ## ## */ +/* ## Intel Open Source License ## */ +/* ## ## */ +/* ## Copyright (c) 2001 Intel Corporation ## */ +/* ## All rights reserved. ## */ +/* ## Redistribution and use in source and binary forms, with or ## */ +/* ## without modification, are permitted provided that the following ## */ +/* ## conditions are met: ## */ +/* ## ## */ +/* ## Redistributions of source code must retain the above copyright ## */ +/* ## notice, this list of conditions and the following disclaimer. ## */ +/* ## ## */ +/* ## Redistributions in binary form must reproduce the above copyright ## */ +/* ## notice, this list of conditions and the following disclaimer in ## */ +/* ## the documentation and/or other materials provided with the ## */ +/* ## distribution. ## */ +/* ## ## */ +/* ## Neither the name of the Intel Corporation nor the names of its ## */ +/* ## contributors may be used to endorse or promote products derived ## */ +/* ## from this software without specific prior written permission. ## */ +/* ## ## */ +/* ## THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND ## */ +/* ## CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, ## */ +/* ## INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF ## */ +/* ## MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE ## */ +/* ## DISCLAIMED. IN NO EVENT SHALL THE INTEL OR ITS CONTRIBUTORS BE ## */ +/* ## LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, ## */ +/* ## OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, ## */ +/* ## PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, ## */ +/* ## OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY ## */ +/* ## THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR ## */ +/* ## TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT ## */ +/* ## OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY ## */ +/* ## OF SUCH DAMAGE. ## */ +/* ## ## */ +/* ## ------------------------------------------------------------------- ## */ +/* ## ## */ +/* ## Remarks ...: ## */ +/* ## ## */ +/* ## ------------------------------------------------------------------- ## */ +/* ## ## */ +/* ## Changes ...: 2003-10-17 (daniel.scheibli@edelbyte.org) ## */ +/* ## - Moved to the use of the IOMTR_[OSFAMILY|OS|CPU]_* ## */ +/* ## global defines. ## */ +/* ## - Integrated the License Statement into this header. ## */ +/* ## - Added new header holding the changelog. ## */ +/* ## ## */ +/* ######################################################################### */ //Microsoft Visual C++ generated resource script. // #include "PulsarRC.h" @@ -44,7 +70,7 @@ #undef APSTUDIO_READONLY_SYMBOLS #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) -#ifdef _WIN32 +#if defined(IOMTR_OS_WIN32) LANGUAGE 9, 1 #pragma code_page(1252) #endif //_WIN32 @@ -70,7 +96,7 @@ BEGIN "\r\n" "#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU)\r\n" - "#ifdef _WIN32\r\n" + "#if defined(IOMTR_OS_WIN32)\r\n" "LANGUAGE 9, 1\r\n" "#pragma code_page(1252)\r\n" "#endif\r\n" @@ -105,7 +131,7 @@ // #if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) -#ifdef _WIN32 +#if defined(IOMTR_OS_WIN32) LANGUAGE 9, 1 #pragma code_page(1252) #endif --- PulsarRC.h Sat Oct 18 22:46:46 2003 +++ PulsarRC.h.mod Sat Oct 18 21:23:19 2003 @@ -1,34 +1,60 @@ -/* -Intel Open Source License - -Copyright (c) 2001 Intel Corporation -All rights reserved. -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: - - Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimer. - - Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - - Neither the name of the Intel Corporation nor the names of its contributors - may be used to endorse or promote products derived from this software - without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ``AS IS'' -AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -ARE DISCLAIMED. IN NO EVENT SHALL THE INTEL OR ITS CONTRIBUTORS BE LIABLE -FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE -USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -*/ +/* ######################################################################### */ +/* ## ## */ +/* ## Iometer / PularRC.h ## */ +/* ## ## */ +/* ## ------------------------------------------------------------------- ## */ +/* ## ## */ +/* ## Job .......: ... ## */ +/* ## ## */ +/* ## ------------------------------------------------------------------- ## */ +/* ## ## */ +/* ## Intel Open Source License ## */ +/* ## ## */ +/* ## Copyright (c) 2001 Intel Corporation ## */ +/* ## All rights reserved. ## */ +/* ## Redistribution and use in source and binary forms, with or ## */ +/* ## without modification, are permitted provided that the following ## */ +/* ## conditions are met: ## */ +/* ## ## */ +/* ## Redistributions of source code must retain the above copyright ## */ +/* ## notice, this list of conditions and the following disclaimer. ## */ +/* ## ## */ +/* ## Redistributions in binary form must reproduce the above copyright ## */ +/* ## notice, this list of conditions and the following disclaimer in ## */ +/* ## the documentation and/or other materials provided with the ## */ +/* ## distribution. ## */ +/* ## ## */ +/* ## Neither the name of the Intel Corporation nor the names of its ## */ +/* ## contributors may be used to endorse or promote products derived ## */ +/* ## from this software without specific prior written permission. ## */ +/* ## ## */ +/* ## THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND ## */ +/* ## CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, ## */ +/* ## INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF ## */ +/* ## MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE ## */ +/* ## DISCLAIMED. IN NO EVENT SHALL THE INTEL OR ITS CONTRIBUTORS BE ## */ +/* ## LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, ## */ +/* ## OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, ## */ +/* ## PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, ## */ +/* ## OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY ## */ +/* ## THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR ## */ +/* ## TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT ## */ +/* ## OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY ## */ +/* ## OF SUCH DAMAGE. ## */ +/* ## ## */ +/* ## ------------------------------------------------------------------- ## */ +/* ## ## */ +/* ## Remarks ...: ## */ +/* ## ## */ +/* ## ------------------------------------------------------------------- ## */ +/* ## ## */ +/* ## Changes ...: 2003-10-17 (daniel.scheibli@edelbyte.org) ## */ +/* ## - Moved to the use of the IOMTR_[OSFAMILY|OS|CPU]_* ## */ +/* ## global defines. ## */ +/* ## - Integrated the License Statement into this header. ## */ +/* ## - Added new header holding the changelog. ## */ +/* ## ## */ +/* ######################################################################### */ //{{NO_DEPENDENCIES}} // Microsoft Visual C++ generated include file. // Used by Pulsar.rc --- StdAfx.cpp Sat Jul 19 10:22:39 2003 +++ StdAfx.cpp.mod Sat Oct 18 21:26:32 2003 @@ -1,48 +1,66 @@ -/* -Intel Open Source License +/* ######################################################################### */ +/* ## ## */ +/* ## Iometer / StdAfx.cpp ## */ +/* ## ## */ +/* ## ------------------------------------------------------------------- ## */ +/* ## ## */ +/* ## Job .......: Source file that includes just the standard includes ## */ +/* ## ## */ +/* ## ------------------------------------------------------------------- ## */ +/* ## ## */ +/* ## Intel Open Source License ## */ +/* ## ## */ +/* ## Copyright (c) 2001 Intel Corporation ## */ +/* ## All rights reserved. ## */ +/* ## Redistribution and use in source and binary forms, with or ## */ +/* ## without modification, are permitted provided that the following ## */ +/* ## conditions are met: ## */ +/* ## ## */ +/* ## Redistributions of source code must retain the above copyright ## */ +/* ## notice, this list of conditions and the following disclaimer. ## */ +/* ## ## */ +/* ## Redistributions in binary form must reproduce the above copyright ## */ +/* ## notice, this list of conditions and the following disclaimer in ## */ +/* ## the documentation and/or other materials provided with the ## */ +/* ## distribution. ## */ +/* ## ## */ +/* ## Neither the name of the Intel Corporation nor the names of its ## */ +/* ## contributors may be used to endorse or promote products derived ## */ +/* ## from this software without specific prior written permission. ## */ +/* ## ## */ +/* ## THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND ## */ +/* ## CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, ## */ +/* ## INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF ## */ +/* ## MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE ## */ +/* ## DISCLAIMED. IN NO EVENT SHALL THE INTEL OR ITS CONTRIBUTORS BE ## */ +/* ## LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, ## */ +/* ## OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, ## */ +/* ## PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, ## */ +/* ## OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY ## */ +/* ## THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR ## */ +/* ## TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT ## */ +/* ## OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY ## */ +/* ## OF SUCH DAMAGE. ## */ +/* ## ## */ +/* ## ------------------------------------------------------------------- ## */ +/* ## ## */ +/* ## Remarks ...: - Galileo.pch will be the pre-compiled header ## */ +/* ## - stdafx.obj will contain the pre-compiled type ## */ +/* ## information. ## */ +/* ## ## */ +/* ## ------------------------------------------------------------------- ## */ +/* ## ## */ +/* ## Changes ...: 2003-10-17 (daniel.scheibli@edelbyte.org) ## */ +/* ## - Moved to the use of the IOMTR_[OSFAMILY|OS|CPU]_* ## */ +/* ## global defines. ## */ +/* ## - Integrated the License Statement into this header. ## */ +/* ## - Added new header holding the changelog. ## */ +/* ## ## */ +/* ######################################################################### */ -Copyright (c) 2001 Intel Corporation -All rights reserved. -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: - Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimer. - - Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. +#include "stdafx.h" - Neither the name of the Intel Corporation nor the names of its contributors - may be used to endorse or promote products derived from this software - without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ``AS IS'' -AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -ARE DISCLAIMED. IN NO EVENT SHALL THE INTEL OR ITS CONTRIBUTORS BE LIABLE -FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE -USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -*/ -// ========================================================================== -// Copyright (C) 1997-2000 Intel Corporation -// All rights reserved -// INTEL CORPORATION PROPRIETARY INFORMATION -// This software is supplied under the terms of a license agreement or -// nondisclosure agreement with Intel Corporation and may not be copied -// or disclosed except in accordance with the terms of that agreement. -// ========================================================================== -// -// StdAfx.cpp: source file that includes just the standard includes -// Galileo.pch will be the pre-compiled header -// stdafx.obj will contain the pre-compiled type information -// -////////////////////////////////////////////////////////////////////// -#include "stdafx.h" --- StdAfx.h Sat Jul 19 10:22:39 2003 +++ StdAfx.h.mod Sat Oct 18 21:28:16 2003 @@ -1,48 +1,63 @@ -/* -Intel Open Source License +/* ######################################################################### */ +/* ## ## */ +/* ## Iometer / StdAfx.h ## */ +/* ## ## */ +/* ## ------------------------------------------------------------------- ## */ +/* ## ## */ +/* ## Job .......: Include file for standard system include files, ## */ +/* ## or project specific include files that are used ## */ +/* ## frequently, but are changed infrequently. ## */ +/* ## ## */ +/* ## ------------------------------------------------------------------- ## */ +/* ## ## */ +/* ## Intel Open Source License ## */ +/* ## ## */ +/* ## Copyright (c) 2001 Intel Corporation ## */ +/* ## All rights reserved. ## */ +/* ## Redistribution and use in source and binary forms, with or ## */ +/* ## without modification, are permitted provided that the following ## */ +/* ## conditions are met: ## */ +/* ## ## */ +/* ## Redistributions of source code must retain the above copyright ## */ +/* ## notice, this list of conditions and the following disclaimer. ## */ +/* ## ## */ +/* ## Redistributions in binary form must reproduce the above copyright ## */ +/* ## notice, this list of conditions and the following disclaimer in ## */ +/* ## the documentation and/or other materials provided with the ## */ +/* ## distribution. ## */ +/* ## ## */ +/* ## Neither the name of the Intel Corporation nor the names of its ## */ +/* ## contributors may be used to endorse or promote products derived ## */ +/* ## from this software without specific prior written permission. ## */ +/* ## ## */ +/* ## THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND ## */ +/* ## CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, ## */ +/* ## INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF ## */ +/* ## MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE ## */ +/* ## DISCLAIMED. IN NO EVENT SHALL THE INTEL OR ITS CONTRIBUTORS BE ## */ +/* ## LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, ## */ +/* ## OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, ## */ +/* ## PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, ## */ +/* ## OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY ## */ +/* ## THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR ## */ +/* ## TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT ## */ +/* ## OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY ## */ +/* ## OF SUCH DAMAGE. ## */ +/* ## ## */ +/* ## ------------------------------------------------------------------- ## */ +/* ## ## */ +/* ## Remarks ...: ## */ +/* ## ## */ +/* ## ------------------------------------------------------------------- ## */ +/* ## ## */ +/* ## Changes ...: 2003-10-17 (daniel.scheibli@edelbyte.org) ## */ +/* ## - Moved to the use of the IOMTR_[OSFAMILY|OS|CPU]_* ## */ +/* ## global defines. ## */ +/* ## - Integrated the License Statement into this header. ## */ +/* ## - Added new header holding the changelog. ## */ +/* ## ## */ +/* ######################################################################### */ -Copyright (c) 2001 Intel Corporation -All rights reserved. -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: - - Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimer. - - Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - - Neither the name of the Intel Corporation nor the names of its contributors - may be used to endorse or promote products derived from this software - without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ``AS IS'' -AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -ARE DISCLAIMED. IN NO EVENT SHALL THE INTEL OR ITS CONTRIBUTORS BE LIABLE -FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE -USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -*/ -// ========================================================================== -// Copyright (C) 1997-2000 Intel Corporation -// All rights reserved -// INTEL CORPORATION PROPRIETARY INFORMATION -// This software is supplied under the terms of a license agreement or -// nondisclosure agreement with Intel Corporation and may not be copied -// or disclosed except in accordance with the terms of that agreement. -// ========================================================================== -// -// stdafx.h : include file for standard system include files, -// or project specific include files that are used frequently, but -// are changed infrequently -// -////////////////////////////////////////////////////////////////////// #define VC_EXTRALEAN // Exclude rarely-used stuff from Windows headers --- TextDisplay.cpp Sat Jul 19 10:22:39 2003 +++ TextDisplay.cpp.mod Sat Oct 18 21:56:18 2003 @@ -4,7 +4,45 @@ /* ## ## */ /* ## ------------------------------------------------------------------- ## */ /* ## ## */ -/* ## Job .......: ... ## */ +/* ## Job .......: Implementation of the CTextDisplay class, which ## */ +/* ## provides the large text in the "Presentation Meter" ## */ +/* ## dialog. ## */ +/* ## ## */ +/* ## ------------------------------------------------------------------- ## */ +/* ## ## */ +/* ## Intel Open Source License ## */ +/* ## ## */ +/* ## Copyright (c) 2001 Intel Corporation ## */ +/* ## All rights reserved. ## */ +/* ## Redistribution and use in source and binary forms, with or ## */ +/* ## without modification, are permitted provided that the following ## */ +/* ## conditions are met: ## */ +/* ## ## */ +/* ## Redistributions of source code must retain the above copyright ## */ +/* ## notice, this list of conditions and the following disclaimer. ## */ +/* ## ## */ +/* ## Redistributions in binary form must reproduce the above copyright ## */ +/* ## notice, this list of conditions and the following disclaimer in ## */ +/* ## the documentation and/or other materials provided with the ## */ +/* ## distribution. ## */ +/* ## ## */ +/* ## Neither the name of the Intel Corporation nor the names of its ## */ +/* ## contributors may be used to endorse or promote products derived ## */ +/* ## from this software without specific prior written permission. ## */ +/* ## ## */ +/* ## THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND ## */ +/* ## CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, ## */ +/* ## INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF ## */ +/* ## MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE ## */ +/* ## DISCLAIMED. IN NO EVENT SHALL THE INTEL OR ITS CONTRIBUTORS BE ## */ +/* ## LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, ## */ +/* ## OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, ## */ +/* ## PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, ## */ +/* ## OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY ## */ +/* ## THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR ## */ +/* ## TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT ## */ +/* ## OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY ## */ +/* ## OF SUCH DAMAGE. ## */ /* ## ## */ /* ## ------------------------------------------------------------------- ## */ /* ## ## */ @@ -12,57 +50,16 @@ /* ## ## */ /* ## ------------------------------------------------------------------- ## */ /* ## ## */ -/* ## Changes ...: 2003-04-25 (daniel.scheibli@edelbyte.org) ## */ +/* ## Changes ...: 2003-10-17 (daniel.scheibli@edelbyte.org) ## */ +/* ## - Moved to the use of the IOMTR_[OSFAMILY|OS|CPU]_* ## */ +/* ## global defines. ## */ +/* ## - Integrated the License Statement into this header. ## */ +/* ## 2003-04-25 (daniel.scheibli@edelbyte.org) ## */ /* ## - Updated the global debug flag (_DEBUG) handling ## */ /* ## of the source file (check for platform etc.). ## */ /* ## - Added new header holding the changelog. ## */ /* ## ## */ /* ######################################################################### */ -/* -Intel Open Source License - -Copyright (c) 2001 Intel Corporation -All rights reserved. -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: - - Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimer. - - Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - - Neither the name of the Intel Corporation nor the names of its contributors - may be used to endorse or promote products derived from this software - without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ``AS IS'' -AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -ARE DISCLAIMED. IN NO EVENT SHALL THE INTEL OR ITS CONTRIBUTORS BE LIABLE -FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE -USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -*/ -// ========================================================================== -// Copyright (C) 1997-2000 Intel Corporation -// All rights reserved -// INTEL CORPORATION PROPRIETARY INFORMATION -// This software is supplied under the terms of a license agreement or -// nondisclosure agreement with Intel Corporation and may not be copied -// or disclosed except in accordance with the terms of that agreement. -// ========================================================================== -// -// TextDisplay.cpp: Implementation of the CTextDisplay class, which provides -// the large text in the "Presentation Meter" dialog. -// -////////////////////////////////////////////////////////////////////// -/* ######################################################################### */ #include "stdafx.h" @@ -78,12 +75,12 @@ // will be a MFC hacker who could advice here. // [1] = http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vclib/html/_mfc_debug_new.asp // -#if defined (_WIN32) || defined (_WIN64) -#ifdef _DEBUG -#define new DEBUG_NEW -#undef THIS_FILE -static char THIS_FILE[] = __FILE__; -#endif +#if defined(IOMTR_OS_WIN32) || defined(IOMTR_OS_WIN64) + #ifdef _DEBUG + #define new DEBUG_NEW + #undef THIS_FILE + static char THIS_FILE[] = __FILE__; + #endif #endif --- TextDisplay.h Sat Jul 19 10:22:39 2003 +++ TextDisplay.h.mod Sat Oct 18 21:31:31 2003 @@ -1,50 +1,64 @@ -/* -Intel Open Source License - -Copyright (c) 2001 Intel Corporation -All rights reserved. -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: - - Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimer. - - Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - - Neither the name of the Intel Corporation nor the names of its contributors - may be used to endorse or promote products derived from this software - without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ``AS IS'' -AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -ARE DISCLAIMED. IN NO EVENT SHALL THE INTEL OR ITS CONTRIBUTORS BE LIABLE -FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE -USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -*/ -// ========================================================================== -// Copyright (C) 1997-2000 Intel Corporation -// All rights reserved -// INTEL CORPORATION PROPRIETARY INFORMATION -// This software is supplied under the terms of a license agreement or -// nondisclosure agreement with Intel Corporation and may not be copied -// or disclosed except in accordance with the terms of that agreement. -// ========================================================================== -// -// TextDisplay.h: Interface for the CTextDisplay class, which provides -// the large text in the "Presentation Meter" dialog. -// -////////////////////////////////////////////////////////////////////// - +/* ######################################################################### */ +/* ## ## */ +/* ## (Iometer) / TextDisplay.h ## */ +/* ## ## */ +/* ## ------------------------------------------------------------------- ## */ +/* ## ## */ +/* ## Job .......: Interface for the CTextDisplay class, which provides ## */ +/* ## the large text in the "Presentation Meter" dialog. ## */ +/* ## ## */ +/* ## ------------------------------------------------------------------- ## */ +/* ## ## */ +/* ## Intel Open Source License ## */ +/* ## ## */ +/* ## Copyright (c) 2001 Intel Corporation ## */ +/* ## All rights reserved. ## */ +/* ## Redistribution and use in source and binary forms, with or ## */ +/* ## without modification, are permitted provided that the following ## */ +/* ## conditions are met: ## */ +/* ## ## */ +/* ## Redistributions of source code must retain the above copyright ## */ +/* ## notice, this list of conditions and the following disclaimer. ## */ +/* ## ## */ +/* ## Redistributions in binary form must reproduce the above copyright ## */ +/* ## notice, this list of conditions and the following disclaimer in ## */ +/* ## the documentation and/or other materials provided with the ## */ +/* ## distribution. ## */ +/* ## ## */ +/* ## Neither the name of the Intel Corporation nor the names of its ## */ +/* ## contributors may be used to endorse or promote products derived ## */ +/* ## from this software without specific prior written permission. ## */ +/* ## ## */ +/* ## THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND ## */ +/* ## CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, ## */ +/* ## INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF ## */ +/* ## MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE ## */ +/* ## DISCLAIMED. IN NO EVENT SHALL THE INTEL OR ITS CONTRIBUTORS BE ## */ +/* ## LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, ## */ +/* ## OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, ## */ +/* ## PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, ## */ +/* ## OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY ## */ +/* ## THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR ## */ +/* ## TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT ## */ +/* ## OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY ## */ +/* ## OF SUCH DAMAGE. ## */ +/* ## ## */ +/* ## ------------------------------------------------------------------- ## */ +/* ## ## */ +/* ## Remarks ...: ## */ +/* ## ## */ +/* ## ------------------------------------------------------------------- ## */ +/* ## ## */ +/* ## Changes ...: 2003-10-17 (daniel.scheibli@edelbyte.org) ## */ +/* ## - Moved to the use of the IOMTR_[OSFAMILY|OS|CPU]_* ## */ +/* ## global defines. ## */ +/* ## - Integrated the License Statement into this header. ## */ +/* ## - Added new header holding the changelog. ## */ +/* ## ## */ +/* ######################################################################### */ #ifndef TEXTDISPLAY_DEFINED #define TEXTDISPLAY_DEFINED + #include "GalileoDefs.h" --- WaitingForManagers.cpp Sun Aug 3 10:44:54 2003 +++ WaitingForManagers.cpp.mod Sat Oct 18 21:56:33 2003 @@ -48,7 +48,10 @@ /* ## ## */ /* ## ------------------------------------------------------------------- ## */ /* ## ## */ -/* ## Changes ...: 2003-08-03 (daniel.scheibli@edelbyte.org) ## */ +/* ## Changes ...: 2003-10-17 (daniel.scheibli@edelbyte.org) ## */ +/* ## - Moved to the use of the IOMTR_[OSFAMILY|OS|CPU]_* ## */ +/* ## global defines. ## */ +/* ## 2003-08-03 (daniel.scheibli@edelbyte.org) ## */ /* ## - Integrated the patch submitted by Sander Pool to ## */ /* ## get Iometer "truly batch oriented". ## */ /* ## - Integrated the License Statement into this header. ## */ @@ -78,12 +81,12 @@ // will be a MFC hacker who could advice here. // [1] = http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vclib/html/_mfc_debug_new.asp // -#if defined (_WIN32) || defined (_WIN64) -#ifdef _DEBUG -#define new DEBUG_NEW -#undef THIS_FILE -static char THIS_FILE[] = __FILE__; -#endif +#if defined(IOMTR_OS_WIN32) || defined(IOMTR_OS_WIN64) + #ifdef _DEBUG + #define new DEBUG_NEW + #undef THIS_FILE + static char THIS_FILE[] = __FILE__; + #endif #endif --- WaitingForManagers.h Sat Jul 19 10:22:39 2003 +++ WaitingForManagers.h.mod Sat Oct 18 21:38:05 2003 @@ -4,7 +4,48 @@ /* ## ## */ /* ## ------------------------------------------------------------------- ## */ /* ## ## */ -/* ## Job .......: This is the Header file of the WFM dialog. ## */ +/* ## Job .......: WaitingForManagers.h: Interface for the ## */ +/* ## CWaitingForManagers class, which is responsible for ## */ +/* ## the "Waiting for Managers" dialog (called when an ## */ +/* ## .ICF file specified on the command line calls for ## */ +/* ## managers that are not yet logged in). The managers ## */ +/* ## being waited on are displayed in a List Control. ## */ +/* ## ## */ +/* ## ------------------------------------------------------------------- ## */ +/* ## ## */ +/* ## Intel Open Source License ## */ +/* ## ## */ +/* ## Copyright (c) 2001 Intel Corporation ## */ +/* ## All rights reserved. ## */ +/* ## Redistribution and use in source and binary forms, with or ## */ +/* ## without modification, are permitted provided that the following ## */ +/* ## conditions are met: ## */ +/* ## ## */ +/* ## Redistributions of source code must retain the above copyright ## */ +/* ## notice, this list of conditions and the following disclaimer. ## */ +/* ## ## */ +/* ## Redistributions in binary form must reproduce the above copyright ## */ +/* ## notice, this list of conditions and the following disclaimer in ## */ +/* ## the documentation and/or other materials provided with the ## */ +/* ## distribution. ## */ +/* ## ## */ +/* ## Neither the name of the Intel Corporation nor the names of its ## */ +/* ## contributors may be used to endorse or promote products derived ## */ +/* ## from this software without specific prior written permission. ## */ +/* ## ## */ +/* ## THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND ## */ +/* ## CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, ## */ +/* ## INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF ## */ +/* ## MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE ## */ +/* ## DISCLAIMED. IN NO EVENT SHALL THE INTEL OR ITS CONTRIBUTORS BE ## */ +/* ## LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, ## */ +/* ## OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, ## */ +/* ## PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, ## */ +/* ## OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY ## */ +/* ## THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR ## */ +/* ## TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT ## */ +/* ## OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY ## */ +/* ## OF SUCH DAMAGE. ## */ /* ## ## */ /* ## ------------------------------------------------------------------- ## */ /* ## ## */ @@ -12,63 +53,19 @@ /* ## ## */ /* ## ------------------------------------------------------------------- ## */ /* ## ## */ -/* ## Changes ...: ## */ +/* ## Changes ...: 2003-10-17 (daniel.scheibli@edelbyte.org) ## */ +/* ## - Moved to the use of the IOMTR_[OSFAMILY|OS|CPU]_* ## */ +/* ## global defines. ## */ +/* ## - Integrated the License Statement into this header. ## */ /* ## 2003-03-28 (joe@eiler.net) ## */ /* ## - changes so VC++ 7 (.NET) will compile correctly. ## */ /* ## 2003-03-28 (joe@eiler.net) ## */ /* ## - added new header info. ## */ /* ## ## */ /* ######################################################################### */ -/* -Intel Open Source License - -Copyright (c) 2001 Intel Corporation -All rights reserved. -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: - - Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimer. - - Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - - Neither the name of the Intel Corporation nor the names of its contributors - may be used to endorse or promote products derived from this software - without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ``AS IS'' -AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -ARE DISCLAIMED. IN NO EVENT SHALL THE INTEL OR ITS CONTRIBUTORS BE LIABLE -FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE -USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -*/ -// ========================================================================== -// Copyright (C) 1997-2000 Intel Corporation -// All rights reserved -// INTEL CORPORATION PROPRIETARY INFORMATION -// This software is supplied under the terms of a license agreement or -// nondisclosure agreement with Intel Corporation and may not be copied -// or disclosed except in accordance with the terms of that agreement. -// ========================================================================== -// -// WaitingForManagers.h: Interface for the CWaitingForManagers class, -// which is responsible for the "Waiting for Managers" dialog (called when -// an .ICF file specified on the command line calls for managers that are -// not yet logged in). The managers being waited on are displayed in a -// List Control. -// -////////////////////////////////////////////////////////////////////// - #ifndef WAITING_FOR_MANAGERS_DEFINED #define WAITING_FOR_MANAGERS_DEFINED + #include #include "resource.h" --- Worker.cpp Sat Jul 19 14:28:02 2003 +++ Worker.cpp.mod Sat Oct 18 21:56:59 2003 @@ -49,7 +49,10 @@ /* ## ## */ /* ## ------------------------------------------------------------------- ## */ /* ## ## */ -/* ## Changes ...: 2003-07-19 (daniel.scheibli@edelbyte.org) ## */ +/* ## Changes ...: 2003-10-17 (daniel.scheibli@edelbyte.org) ## */ +/* ## - Moved to the use of the IOMTR_[OSFAMILY|OS|CPU]_* ## */ +/* ## global defines. ## */ +/* ## 2003-07-19 (daniel.scheibli@edelbyte.org) ## */ /* ## - Removed IOTime.h inclusion (now in IOCommon.h) ## */ /* ## - Integrated the License Statement into this header. ## */ /* ## 2003-04-25 (daniel.scheibli@edelbyte.org) ## */ @@ -81,7 +84,7 @@ // will be a MFC hacker who could advice here. // [1] = http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vclib/html/_mfc_debug_new.asp // -#if defined (_WIN32) || defined (_WIN64) +#if defined(IOMTR_OS_WIN32) || defined(IOMTR_OS_WIN64) #ifdef _DEBUG #define new DEBUG_NEW #undef THIS_FILE @@ -614,7 +617,7 @@ target->spec.vi_info.remote_address.DiscriminatorLen ); vi_discriminator_length = min( vi_discriminator_length, VI_DISCRIMINATOR_SIZE ); -#if defined (_M_IX86) || defined (_M_IA64) +#if defined(IOMTR_CPU_I386) || defined(IOMTR_CPU_IA64) // Intel processor (little-endian) -- use the first VI_DISCRIMINATOR_SIZE bytes // (least significant bytes) of the current 64-bit system time as the discriminator. vi_discriminator = (VI_DISCRIMINATOR_TYPE)rdtsc(); --- Worker.h Sat Jul 19 10:22:42 2003 +++ Worker.h.mod Sat Oct 18 18:05:21 2003 @@ -1,49 +1,63 @@ -/* -Intel Open Source License - -Copyright (c) 2001 Intel Corporation -All rights reserved. -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: - - Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimer. - - Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - - Neither the name of the Intel Corporation nor the names of its contributors - may be used to endorse or promote products derived from this software - without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ``AS IS'' -AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -ARE DISCLAIMED. IN NO EVENT SHALL THE INTEL OR ITS CONTRIBUTORS BE LIABLE -FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE -USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -*/ -// ========================================================================== -// Copyright (C) 1997-2000 Intel Corporation -// All rights reserved -// INTEL CORPORATION PROPRIETARY INFORMATION -// This software is supplied under the terms of a license agreement or -// nondisclosure agreement with Intel Corporation and may not be copied -// or disclosed except in accordance with the terms of that agreement. -// ========================================================================== -// -// Worker.h: Interface for Iometer's Worker class, which is in charge of -// keeping results for each worker, as well as maintaining the list of -// currently-assigned targets for each worker. -// -////////////////////////////////////////////////////////////////////// - +/* ######################################################################### */ +/* ## ## */ +/* ## (Iometer) / Worker.h ## */ +/* ## ## */ +/* ## ------------------------------------------------------------------- ## */ +/* ## ## */ +/* ## Job .......: Interface for Iometer's Worker class, which is in ## */ +/* ## charge of keeping results for each worker, as well ## */ +/* ## as maintaining the list of currently-assigned targets ## */ +/* ## for each worker. ## */ +/* ## ## */ +/* ## ------------------------------------------------------------------- ## */ +/* ## ## */ +/* ## Intel Open Source License ## */ +/* ## ## */ +/* ## Copyright (c) 2001 Intel Corporation ## */ +/* ## All rights reserved. ## */ +/* ## Redistribution and use in source and binary forms, with or ## */ +/* ## without modification, are permitted provided that the following ## */ +/* ## conditions are met: ## */ +/* ## ## */ +/* ## Redistributions of source code must retain the above copyright ## */ +/* ## notice, this list of conditions and the following disclaimer. ## */ +/* ## ## */ +/* ## Redistributions in binary form must reproduce the above copyright ## */ +/* ## notice, this list of conditions and the following disclaimer in ## */ +/* ## the documentation and/or other materials provided with the ## */ +/* ## distribution. ## */ +/* ## ## */ +/* ## Neither the name of the Intel Corporation nor the names of its ## */ +/* ## contributors may be used to endorse or promote products derived ## */ +/* ## from this software without specific prior written permission. ## */ +/* ## ## */ +/* ## THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND ## */ +/* ## CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, ## */ +/* ## INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF ## */ +/* ## MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE ## */ +/* ## DISCLAIMED. IN NO EVENT SHALL THE INTEL OR ITS CONTRIBUTORS BE ## */ +/* ## LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, ## */ +/* ## OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, ## */ +/* ## PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, ## */ +/* ## OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY ## */ +/* ## THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR ## */ +/* ## TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT ## */ +/* ## OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY ## */ +/* ## OF SUCH DAMAGE. ## */ +/* ## ## */ +/* ## ------------------------------------------------------------------- ## */ +/* ## ## */ +/* ## Remarks ...: ## */ +/* ## ## */ +/* ## ------------------------------------------------------------------- ## */ +/* ## ## */ +/* ## Changes ...: 2003-10-17 (daniel.scheibli@edelbyte.org) ## */ +/* ## - Moved to the use of the IOMTR_[OSFAMILY|OS|CPU]_* ## */ +/* ## global defines. ## */ +/* ## - Integrated the License Statement into this header. ## */ +/* ## - Added new header holding the changelog. ## */ +/* ## ## */ +/* ######################################################################### */ #ifndef WORKER_DEFINED #define WORKER_DEFINED --- WorkerView.cpp Sat Jul 19 10:22:45 2003 +++ WorkerView.cpp.mod Sat Oct 18 18:07:48 2003 @@ -4,7 +4,45 @@ /* ## ## */ /* ## ------------------------------------------------------------------- ## */ /* ## ## */ -/* ## Job .......: ... ## */ +/* ## Job .......: Implementation of the CWorkerView class, which is ## */ +/* ## responsible for the "Topology" pane in Iometer's ## */ +/* ## main window. ## */ +/* ## ## */ +/* ## ------------------------------------------------------------------- ## */ +/* ## ## */ +/* ## Intel Open Source License ## */ +/* ## ## */ +/* ## Copyright (c) 2001 Intel Corporation ## */ +/* ## All rights reserved. ## */ +/* ## Redistribution and use in source and binary forms, with or ## */ +/* ## without modification, are permitted provided that the following ## */ +/* ## conditions are met: ## */ +/* ## ## */ +/* ## Redistributions of source code must retain the above copyright ## */ +/* ## notice, this list of conditions and the following disclaimer. ## */ +/* ## ## */ +/* ## Redistributions in binary form must reproduce the above copyright ## */ +/* ## notice, this list of conditions and the following disclaimer in ## */ +/* ## the documentation and/or other materials provided with the ## */ +/* ## distribution. ## */ +/* ## ## */ +/* ## Neither the name of the Intel Corporation nor the names of its ## */ +/* ## contributors may be used to endorse or promote products derived ## */ +/* ## from this software without specific prior written permission. ## */ +/* ## ## */ +/* ## THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND ## */ +/* ## CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, ## */ +/* ## INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF ## */ +/* ## MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE ## */ +/* ## DISCLAIMED. IN NO EVENT SHALL THE INTEL OR ITS CONTRIBUTORS BE ## */ +/* ## LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, ## */ +/* ## OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, ## */ +/* ## PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, ## */ +/* ## OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY ## */ +/* ## THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR ## */ +/* ## TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT ## */ +/* ## OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY ## */ +/* ## OF SUCH DAMAGE. ## */ /* ## ## */ /* ## ------------------------------------------------------------------- ## */ /* ## ## */ @@ -12,57 +50,16 @@ /* ## ## */ /* ## ------------------------------------------------------------------- ## */ /* ## ## */ -/* ## Changes ...: 2003-04-25 (daniel.scheibli@edelbyte.org) ## */ +/* ## Changes ...: 2003-10-17 (daniel.scheibli@edelbyte.org) ## */ +/* ## - Moved to the use of the IOMTR_[OSFAMILY|OS|CPU]_* ## */ +/* ## global defines. ## */ +/* ## - Integrated the License Statement into this header. ## */ +/* ## 2003-04-25 (daniel.scheibli@edelbyte.org) ## */ /* ## - Updated the global debug flag (_DEBUG) handling ## */ /* ## of the source file (check for platform etc.). ## */ /* ## - Added new header holding the changelog. ## */ /* ## ## */ /* ######################################################################### */ -/* -Intel Open Source License - -Copyright (c) 2001 Intel Corporation -All rights reserved. -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: - - Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimer. - - Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - - Neither the name of the Intel Corporation nor the names of its contributors - may be used to endorse or promote products derived from this software - without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ``AS IS'' -AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -ARE DISCLAIMED. IN NO EVENT SHALL THE INTEL OR ITS CONTRIBUTORS BE LIABLE -FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE -USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -*/ -// ========================================================================== -// Copyright (C) 1997-2000 Intel Corporation -// All rights reserved -// INTEL CORPORATION PROPRIETARY INFORMATION -// This software is supplied under the terms of a license agreement or -// nondisclosure agreement with Intel Corporation and may not be copied -// or disclosed except in accordance with the terms of that agreement. -// ========================================================================== -// -// WorkerView.cpp: Implementation of the CWorkerView class, which is -// responsible for the "Topology" pane in Iometer's main window. -// -////////////////////////////////////////////////////////////////////// -/* ######################################################################### */ #include "stdafx.h" @@ -81,12 +78,12 @@ // will be a MFC hacker who could advice here. // [1] = http://msdn.microsoft.com/library/default.asp?url=/library/en-us/vclib/html/_mfc_debug_new.asp // -#if defined (_WIN32) || defined (_WIN64) -#ifdef _DEBUG -#define new DEBUG_NEW -#undef THIS_FILE -static char THIS_FILE[] = __FILE__; -#endif +#if defined(IOMTR_OS_WIN32) || defined(IOMTR_OS_WIN64) + #ifdef _DEBUG + #define new DEBUG_NEW + #undef THIS_FILE + static char THIS_FILE[] = __FILE__; + #endif #endif --- WorkerView.h Sat Jul 19 10:22:45 2003 +++ WorkerView.h.mod Sat Oct 18 18:09:18 2003 @@ -1,50 +1,65 @@ -/* -Intel Open Source License - -Copyright (c) 2001 Intel Corporation -All rights reserved. -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: - - Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimer. - - Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - - Neither the name of the Intel Corporation nor the names of its contributors - may be used to endorse or promote products derived from this software - without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ``AS IS'' -AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -ARE DISCLAIMED. IN NO EVENT SHALL THE INTEL OR ITS CONTRIBUTORS BE LIABLE -FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE -USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -*/ -// ========================================================================== -// Copyright (C) 1997-2000 Intel Corporation -// All rights reserved -// INTEL CORPORATION PROPRIETARY INFORMATION -// This software is supplied under the terms of a license agreement or -// nondisclosure agreement with Intel Corporation and may not be copied -// or disclosed except in accordance with the terms of that agreement. -// ========================================================================== -// -// WorkerView.h: Interface for the CWorkerView class, which is -// responsible for the "Topology" pane in Iometer's main window. -// -////////////////////////////////////////////////////////////////////// - +/* ######################################################################### */ +/* ## ## */ +/* ## (Iometer) / WorkerView.h ## */ +/* ## ## */ +/* ## ------------------------------------------------------------------- ## */ +/* ## ## */ +/* ## Job .......: Interface for the CWorkerView class, which is ## */ +/* ## responsible for the "Topology" pane in Iometer's ## */ +/* ## main window. ## */ +/* ## ## */ +/* ## ------------------------------------------------------------------- ## */ +/* ## ## */ +/* ## Intel Open Source License ## */ +/* ## ## */ +/* ## Copyright (c) 2001 Intel Corporation ## */ +/* ## All rights reserved. ## */ +/* ## Redistribution and use in source and binary forms, with or ## */ +/* ## without modification, are permitted provided that the following ## */ +/* ## conditions are met: ## */ +/* ## ## */ +/* ## Redistributions of source code must retain the above copyright ## */ +/* ## notice, this list of conditions and the following disclaimer. ## */ +/* ## ## */ +/* ## Redistributions in binary form must reproduce the above copyright ## */ +/* ## notice, this list of conditions and the following disclaimer in ## */ +/* ## the documentation and/or other materials provided with the ## */ +/* ## distribution. ## */ +/* ## ## */ +/* ## Neither the name of the Intel Corporation nor the names of its ## */ +/* ## contributors may be used to endorse or promote products derived ## */ +/* ## from this software without specific prior written permission. ## */ +/* ## ## */ +/* ## THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND ## */ +/* ## CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, ## */ +/* ## INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF ## */ +/* ## MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE ## */ +/* ## DISCLAIMED. IN NO EVENT SHALL THE INTEL OR ITS CONTRIBUTORS BE ## */ +/* ## LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, ## */ +/* ## OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, ## */ +/* ## PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, ## */ +/* ## OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY ## */ +/* ## THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR ## */ +/* ## TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT ## */ +/* ## OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY ## */ +/* ## OF SUCH DAMAGE. ## */ +/* ## ## */ +/* ## ------------------------------------------------------------------- ## */ +/* ## ## */ +/* ## Remarks ...: ## */ +/* ## ## */ +/* ## ------------------------------------------------------------------- ## */ +/* ## ## */ +/* ## Changes ...: 2003-10-17 (daniel.scheibli@edelbyte.org) ## */ +/* ## - Moved to the use of the IOMTR_[OSFAMILY|OS|CPU]_* ## */ +/* ## global defines. ## */ +/* ## - Integrated the License Statement into this header. ## */ +/* ## - Added new header holding the changelog. ## */ +/* ## ## */ +/* ######################################################################### */ #ifndef WORKER_VIEW_DEFINED #define WORKER_VIEW_DEFINED + #if _MSC_VER >= 1000 #pragma once --- ostream64.h Sun Oct 19 00:09:51 2003 +++ ostream64.h.mod Sun Oct 19 00:08:13 2003 @@ -110,4 +110,8 @@ +#endif + + + --- resource.h Sat Oct 18 22:47:09 2003 +++ resource.h.mod Sat Oct 18 21:33:48 2003 @@ -1,34 +1,60 @@ -/* -Intel Open Source License - -Copyright (c) 2001 Intel Corporation -All rights reserved. -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: - - Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimer. - - Redistributions in binary form must reproduce the above copyright notice, - this list of conditions and the following disclaimer in the documentation - and/or other materials provided with the distribution. - - Neither the name of the Intel Corporation nor the names of its contributors - may be used to endorse or promote products derived from this software - without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS ``AS IS'' -AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -ARE DISCLAIMED. IN NO EVENT SHALL THE INTEL OR ITS CONTRIBUTORS BE LIABLE -FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER -CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, -OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE -USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -*/ +/* ######################################################################### */ +/* ## ## */ +/* ## Iometer / resourcen.h ## */ +/* ## ## */ +/* ## ------------------------------------------------------------------- ## */ +/* ## ## */ +/* ## Job .......: ... ## */ +/* ## ## */ +/* ## ------------------------------------------------------------------- ## */ +/* ## ## */ +/* ## Intel Open Source License ## */ +/* ## ## */ +/* ## Copyright (c) 2001 Intel Corporation ## */ +/* ## All rights reserved. ## */ +/* ## Redistribution and use in source and binary forms, with or ## */ +/* ## without modification, are permitted provided that the following ## */ +/* ## conditions are met: ## */ +/* ## ## */ +/* ## Redistributions of source code must retain the above copyright ## */ +/* ## notice, this list of conditions and the following disclaimer. ## */ +/* ## ## */ +/* ## Redistributions in binary form must reproduce the above copyright ## */ +/* ## notice, this list of conditions and the following disclaimer in ## */ +/* ## the documentation and/or other materials provided with the ## */ +/* ## distribution. ## */ +/* ## ## */ +/* ## Neither the name of the Intel Corporation nor the names of its ## */ +/* ## contributors may be used to endorse or promote products derived ## */ +/* ## from this software without specific prior written permission. ## */ +/* ## ## */ +/* ## THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND ## */ +/* ## CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, ## */ +/* ## INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF ## */ +/* ## MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE ## */ +/* ## DISCLAIMED. IN NO EVENT SHALL THE INTEL OR ITS CONTRIBUTORS BE ## */ +/* ## LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, ## */ +/* ## OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, ## */ +/* ## PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, ## */ +/* ## OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY ## */ +/* ## THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR ## */ +/* ## TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT ## */ +/* ## OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY ## */ +/* ## OF SUCH DAMAGE. ## */ +/* ## ## */ +/* ## ------------------------------------------------------------------- ## */ +/* ## ## */ +/* ## Remarks ...: ## */ +/* ## ## */ +/* ## ------------------------------------------------------------------- ## */ +/* ## ## */ +/* ## Changes ...: 2003-10-17 (daniel.scheibli@edelbyte.org) ## */ +/* ## - Moved to the use of the IOMTR_[OSFAMILY|OS|CPU]_* ## */ +/* ## global defines. ## */ +/* ## - Integrated the License Statement into this header. ## */ +/* ## - Added new header holding the changelog. ## */ +/* ## ## */ +/* ######################################################################### */ //{{NO_DEPENDENCIES}} // Microsoft Developer Studio generated include file. // Used by Galileo.rc @@ -273,7 +299,7 @@ // #ifdef APSTUDIO_INVOKED #ifndef APSTUDIO_READONLY_SYMBOLS -#define _APS_3D_CONTROLS 1 +#define _APS_3D_CONTROLS 1 #define _APS_NEXT_RESOURCE_VALUE 137 #define _APS_NEXT_COMMAND_VALUE 10000 #define _APS_NEXT_CONTROL_VALUE 1119 --- res/Iometer.rc2 Wed Mar 5 21:49:33 2003 +++ res/Iometer.rc2.mod Sat Oct 18 23:54:45 2003 @@ -1,3 +1,60 @@ +/* ######################################################################### */ +/* ## ## */ +/* ## Iometer / Iometer.rc2 ## */ +/* ## ## */ +/* ## ------------------------------------------------------------------- ## */ +/* ## ## */ +/* ## Job .......: ... ## */ +/* ## ## */ +/* ## ------------------------------------------------------------------- ## */ +/* ## ## */ +/* ## Intel Open Source License ## */ +/* ## ## */ +/* ## Copyright (c) 2001 Intel Corporation ## */ +/* ## All rights reserved. ## */ +/* ## Redistribution and use in source and binary forms, with or ## */ +/* ## without modification, are permitted provided that the following ## */ +/* ## conditions are met: ## */ +/* ## ## */ +/* ## Redistributions of source code must retain the above copyright ## */ +/* ## notice, this list of conditions and the following disclaimer. ## */ +/* ## ## */ +/* ## Redistributions in binary form must reproduce the above copyright ## */ +/* ## notice, this list of conditions and the following disclaimer in ## */ +/* ## the documentation and/or other materials provided with the ## */ +/* ## distribution. ## */ +/* ## ## */ +/* ## Neither the name of the Intel Corporation nor the names of its ## */ +/* ## contributors may be used to endorse or promote products derived ## */ +/* ## from this software without specific prior written permission. ## */ +/* ## ## */ +/* ## THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND ## */ +/* ## CONTRIBUTORS ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, ## */ +/* ## INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF ## */ +/* ## MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE ## */ +/* ## DISCLAIMED. IN NO EVENT SHALL THE INTEL OR ITS CONTRIBUTORS BE ## */ +/* ## LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, ## */ +/* ## OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, ## */ +/* ## PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, ## */ +/* ## OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY ## */ +/* ## THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR ## */ +/* ## TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT ## */ +/* ## OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY ## */ +/* ## OF SUCH DAMAGE. ## */ +/* ## ## */ +/* ## ------------------------------------------------------------------- ## */ +/* ## ## */ +/* ## Remarks ...: ## */ +/* ## ## */ +/* ## ------------------------------------------------------------------- ## */ +/* ## ## */ +/* ## Changes ...: 2003-10-17 (daniel.scheibli@edelbyte.org) ## */ +/* ## - Moved to the use of the IOMTR_[OSFAMILY|OS|CPU]_* ## */ +/* ## global defines. ## */ +/* ## - Integrated the License Statement into this header. ## */ +/* ## - Added new header holding the changelog. ## */ +/* ## ## */ +/* ######################################################################### */ // // IOMETER.RC2 - resources Microsoft Visual C++ does not edit directly // @@ -17,14 +74,14 @@ VS_VERSION_INFO VERSIONINFO FILEFLAGSMASK VS_FFI_FILEFLAGSMASK //0x0000003FL #ifdef _DEBUG -#if defined (_WIN64) +#if defined(IOMTR_OS_WIN64) FILEFLAGS VS_FF_DEBUG | VS_FF_SPECIALBUILD #else FILEFLAGS VS_FF_DEBUG //0x00000001L #endif // _WIN64 #else -#if defined (_WIN64) +#if defined(IOMTR_OS_WIN64) FILEFLAGS 0x0L | VS_FF_SPECIALBUILD #else FILEFLAGS 0x0L //release version