Changeset 2980 in vbox for trunk/src/VBox/Main
- Timestamp:
- Jun 1, 2007 3:56:12 PM (18 years ago)
- svn:sync-xref-src-repo-rev:
- 21699
- Location:
- trunk/src/VBox/Main
- Files:
-
- 3 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/VBox/Main/MachineImpl.cpp
r2961 r2980 5 5 6 6 /* 7 * Copyright (C) 2006 InnoTek SystemberatungGmbH7 * Copyright (C) 2006-2007 innotek GmbH 8 8 * 9 9 * This file is part of VirtualBox Open Source Edition (OSE), as … … 88 88 { 89 89 "<?xml version=\"1.0\" encoding=\"UTF-8\" ?>" RTFILE_LINEFEED 90 "<!-- InnoTek VirtualBox Machine Configuration -->" RTFILE_LINEFEED90 "<!-- innotek VirtualBox Machine Configuration -->" RTFILE_LINEFEED 91 91 "<VirtualBox xmlns=\"" VBOX_XML_NAMESPACE "\" " 92 92 "version=\"" VBOX_XML_VERSION "-" VBOX_XML_PLATFORM "\">" RTFILE_LINEFEED … … 3027 3027 } 3028 3028 3029 /** 3029 /** 3030 3030 * Increases the number of objects dependent on the machine state or on the 3031 3031 * registered state. Guarantees that these two states will not change at … … 3034 3034 * Depending on the @a aDepType value, additional state checks may be 3035 3035 * made. These checks will set extended error info on failure. 3036 * 3036 * 3037 3037 * If this method returns a failure, the dependency is not added and the 3038 3038 * caller is not allowed to rely on any particular machine state or … … 3212 3212 3213 3213 3214 /** 3214 /** 3215 3215 * Chhecks that there are no state dependants. If necessary, waits for the 3216 3216 * number of dependants to drop to zero. Must be called from under … … 3554 3554 mSSData->mStateFilePath.setNull(); 3555 3555 3556 /* no need to use setMachineState() during init() */ 3556 /* no need to use setMachineState() during init() */ 3557 3557 mData->mMachineState = MachineState_Aborted; 3558 3558 } 3559 3559 else if (mSSData->mStateFilePath) 3560 3560 { 3561 /* no need to use setMachineState() during init() */ 3561 /* no need to use setMachineState() during init() */ 3562 3562 mData->mMachineState = MachineState_Saved; 3563 3563 } -
trunk/src/VBox/Main/VirtualBoxImpl.cpp
r2976 r2980 5 5 6 6 /* 7 * Copyright (C) 2006 InnoTek SystemberatungGmbH7 * Copyright (C) 2006-2007 innotek GmbH 8 8 * 9 9 * This file is part of VirtualBox Open Source Edition (OSE), as … … 73 73 { 74 74 "<?xml version=\"1.0\" encoding=\"UTF-8\" ?>" RTFILE_LINEFEED 75 "<!-- InnoTek VirtualBox Global Configuration -->" RTFILE_LINEFEED75 "<!-- innotek VirtualBox Global Configuration -->" RTFILE_LINEFEED 76 76 "<VirtualBox xmlns=\"" VBOX_XML_NAMESPACE "\" " 77 77 "version=\"" VBOX_XML_VERSION "-" VBOX_XML_PLATFORM "\">" RTFILE_LINEFEED … … 3049 3049 /* locations of VDI and VMDK hard disks for now are just 3050 3050 * file paths */ 3051 found = RTPathCompare (location, 3051 found = RTPathCompare (location, 3052 3052 Utf8Str (hd->toString 3053 3053 (false /* aShort */))) == 0; -
trunk/src/VBox/Main/linux/server.cpp
r2976 r2980 5 5 6 6 /* 7 * Copyright (C) 2006 InnoTek SystemberatungGmbH7 * Copyright (C) 2006-2007 innotek GmbH 8 8 * 9 9 * This file is part of VirtualBox Open Source Edition (OSE), as … … 345 345 * 346 346 * In either case, there is nothing to do. 347 * 347 * 348 348 * Note: case b) is actually no more valid since we don't 349 349 * call Release() from DestructEventHandler() in this case … … 525 525 LogFlowFunc (("Another client has requested a reference to VirtualBox, " 526 526 "canceling detruction...\n")); 527 527 528 528 /* make sure the previous timer is stopped */ 529 529 RTTimerStop (sTimer); … … 1140 1140 1141 1141 iSize = snprintf (szBuf, sizeof(szBuf), 1142 " InnoTek VirtualBox XPCOM Server Version %s",1142 "innotek VirtualBox XPCOM Server Version %s", 1143 1143 VBOX_VERSION_STRING); 1144 1144 for (int i=iSize; i>0; i--) 1145 1145 putchar('*'); 1146 1146 printf ("\n%s\n", szBuf); 1147 printf ("(C) 2004-2007 InnoTek SystemberatungGmbH\n");1147 printf ("(C) 2004-2007 innotek GmbH\n"); 1148 1148 printf ("All rights reserved.\n"); 1149 1149 #ifdef DEBUG
Note:
See TracChangeset
for help on using the changeset viewer.