Changeset 51441 in vbox for trunk/src/VBox
- Timestamp:
- May 28, 2014 10:59:01 AM (11 years ago)
- svn:sync-xref-src-repo-rev:
- 93998
- Location:
- trunk/src/VBox/Main
- Files:
-
- 10 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/VBox/Main/src-all/ProgressImpl.cpp
r51092 r51441 159 159 uint64_t ullTimeRemaining = ullTimeTotal - ullTimeElapsed; 160 160 161 // Log(("Progress::GetTimeRemaining: dPercentDone %RI32, ullTimeNow = %RI64, ullTimeElapsed = %RI64, 162 // ullTimeTotal = %RI64, ullTimeRemaining = %RI64\n", 163 // (uint32_t)dPercentDone, ullTimeNow, ullTimeElapsed, ullTimeTotal, ullTimeRemaining)); 161 // LogFunc(("dPercentDone = %RI32, ullTimeNow = %RI64, ullTimeElapsed = %RI64, ullTimeTotal = %RI64, ullTimeRemaining = %RI64\n", 162 // (uint32_t)dPercentDone, ullTimeNow, ullTimeElapsed, ullTimeTotal, ullTimeRemaining)); 164 163 165 164 *aTimeRemaining = (LONG)(ullTimeRemaining / 1000); -
trunk/src/VBox/Main/src-client/ConsoleImpl2.cpp
r51436 r51441 4087 4087 hrc = pMedium->COMGETTER(Location)(loc.asOutParam()); H(); 4088 4088 setVMRuntimeErrorCallbackF(0, "DvdOrFloppyImageInaccessible", 4089 "The image file '%ls' is inaccessible and is being ignored. Please select a different image file for the virtual %s drive.", 4089 "The image file '%ls' is inaccessible and is being ignored. " 4090 "Please select a different image file for the virtual %s drive.", 4090 4091 loc.raw(), 4091 4092 enmType == DeviceType_DVD ? "DVD" : "floppy"); … … 4730 4731 hrc = HRESULT_FROM_WIN32(err); 4731 4732 AssertMsgFailed(("%hrc=%Rhrc %#x\n", hrc, hrc)); 4732 AssertLogRelMsgFailed(( 4733 "NetworkAttachmentType_Bridged: WideCharToMultiByte failed, hr=%Rhrc (0x%x) err=%u\n", 4733 AssertLogRelMsgFailed(("NetworkAttachmentType_Bridged: WideCharToMultiByte failed, hr=%Rhrc (0x%x) err=%u\n", 4734 4734 hrc, hrc, err)); 4735 4735 } … … 5113 5113 DWORD err = GetLastError(); 5114 5114 hrc = HRESULT_FROM_WIN32(err); 5115 AssertLogRelMsgFailed(( 5116 "NetworkAttachmentType_HostOnly: WideCharToMultiByte failed, hr=%Rhrc (0x%x) err=%u\n",hrc, hrc, err));5115 AssertLogRelMsgFailed(("NetworkAttachmentType_HostOnly: WideCharToMultiByte failed, hr=%Rhrc (0x%x) err=%u\n", 5116 hrc, hrc, err)); 5117 5117 } 5118 5118 } … … 5135 5135 { 5136 5136 VBoxNetCfgWinReleaseINetCfg(pNc, FALSE /*fHasWriteLock*/); 5137 AssertLogRelMsgFailed(( 5138 "NetworkAttachmentType_HostOnly: VBoxNetCfgWinGetComponentByGuid failed, hrc=%Rhrc (0x%x)\n",hrc, hrc));5137 AssertLogRelMsgFailed(("NetworkAttachmentType_HostOnly: VBoxNetCfgWinGetComponentByGuid failed, hrc=%Rhrc (0x%x)\n", 5138 hrc, hrc)); 5139 5139 H(); 5140 5140 } -
trunk/src/VBox/Main/src-client/ConsoleImplTeleporter.cpp
r51092 r51441 807 807 */ 808 808 AssertLogRelMsg(enmVMState == VMSTATE_SUSPENDED, ("%s\n", VMR3GetStateName(enmVMState))); 809 AssertLogRelMsg(enmMachineState == MachineState_TeleportingPausedVM, ("%s\n",810 809 AssertLogRelMsg(enmMachineState == MachineState_TeleportingPausedVM, 810 ("%s\n", Global::stringifyMachineState(enmMachineState))); 811 811 812 812 ptrVM.release(); -
trunk/src/VBox/Main/src-client/DisplayImpl.cpp
r51436 r51441 4370 4370 break; 4371 4371 } 4372 else if (pHdr->u8Type != VBOX_VIDEO_INFO_TYPE_NV_HEAP) /** @todo why is 4373 Additions/WINNT/Graphics/Miniport/VBoxVideo. cpp 4374 pushing this to us? */ 4372 else if (pHdr->u8Type != VBOX_VIDEO_INFO_TYPE_NV_HEAP) 4375 4373 { 4374 /** @todo why is Additions/WINNT/Graphics/Miniport/VBoxVideo. cpp pushing this to us? */ 4376 4375 LogRel(("Guest adapter information contains unsupported type %d. The block has been skipped.\n", pHdr->u8Type)); 4377 4376 } -
trunk/src/VBox/Main/src-client/GuestSessionImplTasks.cpp
r51092 r51441 506 506 if (RT_FAILURE(rc)) 507 507 setProgressErrorMsg(VBOX_E_IPRT_ERROR, 508 Utf8StrFmt(GuestSession::tr( 509 "Waiting on termination for copying file \"%s\" failed: %Rrc"), 508 Utf8StrFmt(GuestSession::tr("Waiting on termination for copying file \"%s\" failed: %Rrc"), 510 509 mSource.c_str(), rc)); 511 510 else 512 511 { 513 512 setProgressErrorMsg(VBOX_E_IPRT_ERROR, 514 Utf8StrFmt(GuestSession::tr( 515 "Waiting on termination for copying file \"%s\" failed with wait result %ld"), 513 Utf8StrFmt(GuestSession::tr("Waiting on termination for copying file \"%s\" failed with wait result %ld"), 516 514 mSource.c_str(), waitRes)); 517 515 rc = VERR_GENERAL_FAILURE; /* Fudge. */ … … 530 528 { 531 529 setProgressErrorMsg(VBOX_E_IPRT_ERROR, 532 Utf8StrFmt(GuestSession::tr( 533 "Copying file \"%s\" failed with status %ld, exit code %ld"), 530 Utf8StrFmt(GuestSession::tr("Copying file \"%s\" failed with status %ld, exit code %ld"), 534 531 mSource.c_str(), procStatus, exitCode)); /**@todo Add stringify methods! */ 535 532 rc = VERR_GENERAL_FAILURE; /* Fudge. */ … … 689 686 default: 690 687 setProgressErrorMsg(VBOX_E_IPRT_ERROR, 691 Utf8StrFmt(GuestSession::tr( 692 "Error while creating guest process for copying file \"%s\" from guest to host: %Rrc"), 688 Utf8StrFmt(GuestSession::tr("Error while creating guest process for copying file \"%s\" from guest to host: %Rrc"), 693 689 mSource.c_str(), rc)); 694 690 break; … … 721 717 default: 722 718 setProgressErrorMsg(VBOX_E_IPRT_ERROR, 723 Utf8StrFmt(GuestSession::tr( 724 "Reading from file \"%s\" (offset %RU64) failed: %Rrc"), 719 Utf8StrFmt(GuestSession::tr("Reading from file \"%s\" (offset %RU64) failed: %Rrc"), 725 720 mSource.c_str(), cbWrittenTotal, rc)); 726 721 break; … … 736 731 { 737 732 setProgressErrorMsg(VBOX_E_IPRT_ERROR, 738 Utf8StrFmt(GuestSession::tr( 739 "Error writing to file \"%s\" (%RU64 bytes left): %Rrc"), 733 Utf8StrFmt(GuestSession::tr("Error writing to file \"%s\" (%RU64 bytes left): %Rrc"), 740 734 mDest.c_str(), cbToRead, rc)); 741 735 break; … … 791 785 /* If we did not copy all let the user know. */ 792 786 setProgressErrorMsg(VBOX_E_IPRT_ERROR, 793 Utf8StrFmt(GuestSession::tr( 794 "Copying file \"%s\" failed (%RU64/%RI64 bytes transfered)"), 787 Utf8StrFmt(GuestSession::tr("Copying file \"%s\" failed (%RU64/%RI64 bytes transfered)"), 795 788 mSource.c_str(), cbWrittenTotal, objData.mObjectSize)); 796 789 rc = VERR_GENERAL_FAILURE; /* Fudge. */ … … 807 800 { 808 801 setProgressErrorMsg(VBOX_E_IPRT_ERROR, 809 Utf8StrFmt(GuestSession::tr( 810 "Copying file \"%s\" failed with status %ld, exit code %d"), 802 Utf8StrFmt(GuestSession::tr("Copying file \"%s\" failed with status %ld, exit code %d"), 811 803 mSource.c_str(), procStatus, exitCode)); /**@todo Add 812 804 stringify methods! */ … … 945 937 946 938 ComObjPtr<Progress> pProgressCopyTo; 947 rc = pSession->i_startTaskAsync(Utf8StrFmt(GuestSession::tr( 948 "Copying Guest Additions installer file \"%s\" to \"%s\" on guest"), 939 rc = pSession->i_startTaskAsync(Utf8StrFmt(GuestSession::tr("Copying Guest Additions installer file \"%s\" to \"%s\" on guest"), 949 940 mSource.c_str(), strFileDest.c_str()), 950 941 pTask, pProgressCopyTo); … … 1044 1035 case VERR_NOT_EQUAL: /** @todo Special guest control rc needed! */ 1045 1036 setProgressErrorMsg(VBOX_E_IPRT_ERROR, 1046 Utf8StrFmt(GuestSession::tr( 1047 "Running update file \"%s\" on guest terminated with exit code %ld"), 1037 Utf8StrFmt(GuestSession::tr("Running update file \"%s\" on guest terminated with exit code %ld"), 1048 1038 procInfo.mCommand.c_str(), exitCode)); 1049 1039 break; … … 1056 1046 case VERR_INVALID_STATE: /** @todo Special guest control rc needed! */ 1057 1047 setProgressErrorMsg(VBOX_E_IPRT_ERROR, 1058 Utf8StrFmt(GuestSession::tr( 1059 "Update file \"%s\" reported invalid running state"), 1048 Utf8StrFmt(GuestSession::tr("Update file \"%s\" reported invalid running state"), 1060 1049 procInfo.mCommand.c_str())); 1061 1050 break; … … 1063 1052 default: 1064 1053 setProgressErrorMsg(VBOX_E_IPRT_ERROR, 1065 Utf8StrFmt(GuestSession::tr( 1066 "Error while running update file \"%s\" on guest: %Rrc"), 1054 Utf8StrFmt(GuestSession::tr("Error while running update file \"%s\" on guest: %Rrc"), 1067 1055 procInfo.mCommand.c_str(), vrc)); 1068 1056 break; … … 1127 1115 if (addsRunLevel == AdditionsRunLevelType_System) 1128 1116 hr = setProgressErrorMsg(VBOX_E_NOT_SUPPORTED, 1129 Utf8StrFmt(GuestSession::tr( 1130 "Guest Additions are installed but not fully loaded yet, aborting automatic update"))); 1117 Utf8StrFmt(GuestSession::tr("Guest Additions are installed but not fully loaded yet, aborting automatic update"))); 1131 1118 else 1132 1119 hr = setProgressErrorMsg(VBOX_E_NOT_SUPPORTED, 1133 Utf8StrFmt(GuestSession::tr( 1134 "Guest Additions not installed or ready, aborting automatic update"))); 1120 Utf8StrFmt(GuestSession::tr("Guest Additions not installed or ready, aborting automatic update"))); 1135 1121 rc = VERR_NOT_SUPPORTED; 1136 1122 } … … 1198 1184 { 1199 1185 hr = setProgressErrorMsg(VBOX_E_NOT_SUPPORTED, 1200 Utf8StrFmt(GuestSession::tr( 1201 "Windows 2000 and XP are not supported for automatic updating due to WHQL interaction, please update manually"))); 1186 Utf8StrFmt(GuestSession::tr("Windows 2000 and XP are not supported for automatic updating due to WHQL interaction, please update manually"))); 1202 1187 rc = VERR_NOT_SUPPORTED; 1203 1188 } … … 1207 1192 { 1208 1193 hr = setProgressErrorMsg(VBOX_E_NOT_SUPPORTED, 1209 Utf8StrFmt(GuestSession::tr( 1210 "%s (%s) not supported for automatic updating, please update manually"), 1194 Utf8StrFmt(GuestSession::tr("%s (%s) not supported for automatic updating, please update manually"), 1211 1195 strOSType.c_str(), strOSVer.c_str())); 1212 1196 rc = VERR_NOT_SUPPORTED; … … 1311 1295 default: 1312 1296 hr = setProgressErrorMsg(VBOX_E_IPRT_ERROR, 1313 Utf8StrFmt(GuestSession::tr( 1314 "Error creating installation directory \"%s\" on the guest: %Rrc"), 1297 Utf8StrFmt(GuestSession::tr("Error creating installation directory \"%s\" on the guest: %Rrc"), 1315 1298 strUpdateDir.c_str(), rc)); 1316 1299 break; … … 1443 1426 { 1444 1427 hr = setProgressErrorMsg(VBOX_E_IPRT_ERROR, 1445 Utf8StrFmt(GuestSession::tr( 1446 "Error while copying file \"%s\" to \"%s\" on the guest: %Rrc"), 1428 Utf8StrFmt(GuestSession::tr("Error while copying file \"%s\" to \"%s\" on the guest: %Rrc"), 1447 1429 itFiles->strSource.c_str(), itFiles->strDest.c_str(), rc)); 1448 1430 break; -
trunk/src/VBox/Main/src-server/ApplianceImplImport.cpp
r51092 r51441 3075 3075 { 3076 3076 size_t i = 0; 3077 for (list<VirtualSystemDescriptionEntry*>::const_iterator itHD = 3078 avsdeHDs.begin();itHD != avsdeHDs.end(); ++itHD, i++)3077 for (list<VirtualSystemDescriptionEntry*>::const_iterator itHD = avsdeHDs.begin(); 3078 itHD != avsdeHDs.end(); ++itHD, i++) 3079 3079 Log(("avsdeHDs[%zu]: strRef=%s strOvf=%s\n", i, (*itHD)->strRef.c_str(), (*itHD)->strOvf.c_str())); 3080 3080 i = 0; -
trunk/src/VBox/Main/src-server/NetworkAdapterImpl.cpp
r51092 r51441 1306 1306 1307 1307 Assert(SUCCEEDED(hrc)); /* This is not allowed to fail because the existence 1308 iof the group was checked when it was attached. */1308 * of the group was checked when it was attached. */ 1309 1309 if (SUCCEEDED(hrc)) 1310 1310 pBwGroup.queryInterfaceTo(aBandwidthGroup.asOutParam()); -
trunk/src/VBox/Main/src-server/USBProxyService.cpp
r51092 r51441 356 356 && fRunFilters) 357 357 { 358 Assert(aDone && pHostDevice->i_getUnistate() == 359 kHostUSBDeviceState_HeldByProxy && pHostDevice->i_getMachine().isNull()); 358 Assert( aDone 359 && pHostDevice->i_getUnistate() == kHostUSBDeviceState_HeldByProxy 360 && pHostDevice->i_getMachine().isNull()); 360 361 devLock.release(); 361 362 alock.release(); -
trunk/src/VBox/Main/src-server/VirtualBoxImpl.cpp
r51092 r51441 3854 3854 * 3855 3855 * @param mediaRegistry Settings structure to fill. 3856 * @param uuidRegistry The UUID of the media registry; either a machine UUID (3857 * if machine registry) or the UUID of the global registry.3856 * @param uuidRegistry The UUID of the media registry; either a machine UUID 3857 * (if machine registry) or the UUID of the global registry. 3858 3858 * @param strMachineFolder The machine folder for relative paths, if machine registry, or an empty string otherwise. 3859 3859 */ -
trunk/src/VBox/Main/src-server/win/HostPowerWin.cpp
r51092 r51441 197 197 else 198 198 /* If the machine has less than 5% battery left (and is not connected 199 *to the AC), then we should save the state. */199 * to the AC), then we should save the state. */ 200 200 if (SystemPowerStatus.BatteryFlag == 4 /* critical battery status; less than 5% */) 201 201 {
Note:
See TracChangeset
for help on using the changeset viewer.