Changeset 32588 in vbox for trunk/src/VBox/Additions
- Timestamp:
- Sep 17, 2010 11:10:40 AM (14 years ago)
- svn:sync-xref-src-repo-rev:
- 65985
- Location:
- trunk/src/VBox/Additions/WINNT/VBoxTray
- Files:
-
- 2 edited
-
VBoxDisplay.cpp (modified) (18 diffs)
-
VBoxTray.cpp (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
trunk/src/VBox/Additions/WINNT/VBoxTray/VBoxDisplay.cpp
r32249 r32588 455 455 if (DeviceIoControl (gVBoxDriver, VBOXGUEST_IOCTL_CTL_FILTER_MASK, &maskInfo, sizeof (maskInfo), NULL, 0, &cbReturned, NULL)) 456 456 { 457 Log(("VBoxTray: VBoxDisplayThread 457 Log(("VBoxTray: VBoxDisplayThread: DeviceIOControl(CtlMask - or) succeeded\n")); 458 458 } 459 459 else 460 460 { 461 Log(("VBoxTray: VBoxDisplayThread 461 Log(("VBoxTray: VBoxDisplayThread: DeviceIOControl(CtlMask) failed, DisplayChangeThread exited\n")); 462 462 return -1; 463 463 } … … 471 471 if (DeviceIoControl(gVBoxDriver, VBOXGUEST_IOCTL_WAITEVENT, &waitEvent, sizeof(waitEvent), &waitEvent, sizeof(waitEvent), &cbReturned, NULL)) 472 472 { 473 /*Log(("VBoxTray: VBoxDisplayThread 473 /*Log(("VBoxTray: VBoxDisplayThread: DeviceIOControl succeded\n"));*/ 474 474 475 475 if (NULL == pCtx) { 476 Log(("VBoxTray: VBoxDisplayThread 476 Log(("VBoxTray: VBoxDisplayThread: Invalid context detected!\n")); 477 477 break; 478 478 } 479 479 480 480 if (NULL == pCtx->pEnv) { 481 Log(("VBoxTray: VBoxDisplayThread 481 Log(("VBoxTray: VBoxDisplayThread: Invalid context environment detected!\n")); 482 482 break; 483 483 } … … 487 487 break; 488 488 489 /*Log(("VBoxTray: VBoxDisplayThread 489 /*Log(("VBoxTray: VBoxDisplayThread: checking event\n"));*/ 490 490 491 491 /* did we get the right event? */ 492 492 if (waitEvent.u32EventFlagsOut & VMMDEV_EVENT_DISPLAY_CHANGE_REQUEST) 493 493 { 494 Log(("VBoxTray: VBoxDisplayThread : going to get display change information.\n"));494 Log(("VBoxTray: VBoxDisplayThread: going to get display change information\n")); 495 495 496 496 /* We got at least one event. Read the requested resolution … … 522 522 if (fDisplayChangeQueried) 523 523 { 524 Log(("VBoxTray: VBoxDisplayThread 524 Log(("VBoxTray: VBoxDisplayThread: VMMDevReq_GetDisplayChangeRequest2: %dx%dx%d at %d\n", displayChangeRequest.xres, displayChangeRequest.yres, displayChangeRequest.bpp, displayChangeRequest.display)); 525 525 526 526 /* Horizontal resolution must be a multiple of 8, round down. */ … … 534 534 535 535 if (enmDriverType == VBOXDISPLAY_DRIVER_TYPE_WDDM) 536 Log(("VBoxTray: VBoxDisplayThread 536 Log(("VBoxTray: VBoxDisplayThread: Detected WDDM Driver\n")); 537 537 538 538 if (enmDriverType != VBOXDISPLAY_DRIVER_TYPE_UNKNOWN) … … 541 541 #endif 542 542 { 543 Log(("VBoxTray: VBoxDisplayThread 543 Log(("VBoxTray: VBoxDisplayThread: Display driver is active!\n")); 544 544 545 545 if (pCtx->pfnChangeDisplaySettingsEx != 0) 546 546 { 547 Log(("VBoxTray: VBoxDisplayThread : Detected W2K or later.\n"));547 Log(("VBoxTray: VBoxDisplayThread: Detected W2K or later\n")); 548 548 549 549 #ifdef VBOXWDDM … … 557 557 if (err == NO_ERROR) 558 558 { 559 Log(("VBoxTray: VBoxDisplayThread 559 Log(("VBoxTray: VBoxDisplayThread: VBoxDispIfResize succeeded\n")); 560 560 break; 561 561 } 562 Log(("VBoxTray: VBoxDisplayThread 562 Log(("VBoxTray: VBoxDisplayThread: VBoxDispIfResize failed err(%d)\n", err)); 563 563 } 564 564 #endif … … 575 575 else 576 576 { 577 Log(("VBoxTray: VBoxDisplayThread : Detected NT.\n"));577 Log(("VBoxTray: VBoxDisplayThread: Detected NT\n")); 578 578 579 579 /* Single monitor NT. */ … … 585 585 if (EnumDisplaySettings(NULL, ENUM_REGISTRY_SETTINGS, &devMode)) 586 586 { 587 Log(("VBoxTray: VBoxDisplayThread : Current mode: %dx%dx%d at %d,%d\n", devMode.dmPelsWidth, devMode.dmPelsHeight, devMode.dmBitsPerPel, devMode.dmPosition.x, devMode.dmPosition.y)); 587 Log(("VBoxTray: VBoxDisplayThread: Current mode: %d x %d x %d at %d,%d\n", 588 devMode.dmPelsWidth, devMode.dmPelsHeight, devMode.dmBitsPerPel, devMode.dmPosition.x, devMode.dmPosition.y)); 588 589 589 590 /* Check whether a mode reset or a change is requested. */ … … 603 604 { 604 605 /* All zero values means a forced mode reset. Do nothing. */ 605 Log(("VBoxTray: VBoxDisplayThread : Forced mode reset.\n"));606 Log(("VBoxTray: VBoxDisplayThread: Forced mode reset\n")); 606 607 } 607 608 … … 611 612 && devMode.dmBitsPerPel == displayChangeRequest.bpp) 612 613 { 613 Log(("VBoxTray: VBoxDisplayThread : already at desired resolution.\n"));614 Log(("VBoxTray: VBoxDisplayThread: already at desired resolution\n")); 614 615 break; 615 616 } … … 629 630 devMode.dmBitsPerPel = displayChangeRequest.bpp; 630 631 631 Log(("VBoxTray: VBoxDisplayThread : setting the new mode %dx%dx%d\n", devMode.dmPelsWidth, devMode.dmPelsHeight, devMode.dmBitsPerPel)); 632 Log(("VBoxTray: VBoxDisplayThread: setting new mode %d x %d, %d BPP\n", 633 devMode.dmPelsWidth, devMode.dmPelsHeight, devMode.dmBitsPerPel)); 632 634 633 635 /* set the new mode */ … … 635 637 if (status != DISP_CHANGE_SUCCESSFUL) 636 638 { 637 Log(("VBoxTray: VBoxDisplayThread 639 Log(("VBoxTray: VBoxDisplayThread: error from ChangeDisplaySettings: %d\n", status)); 638 640 639 641 if (status == DISP_CHANGE_BADMODE) … … 651 653 else 652 654 { 653 Log(("VBoxTray: VBoxDisplayThread 655 Log(("VBoxTray: VBoxDisplayThread: error from EnumDisplaySettings: %d\n", GetLastError ())); 654 656 break; 655 657 } … … 658 660 else 659 661 { 660 Log(("VBoxTray: VBoxDisplayThread : vboxDisplayDriver is not active.\n"));662 Log(("VBoxTray: VBoxDisplayThread: vboxDisplayDriver is not active\n")); 661 663 } 662 664 … … 671 673 else 672 674 { 673 Log(("VBoxTray: VBoxDisplayThread 675 Log(("VBoxTray: VBoxDisplayThread: error from DeviceIoControl VBOXGUEST_IOCTL_VMMREQUEST\n")); 674 676 /* sleep a bit to not eat too much CPU while retrying */ 675 677 /* are we supposed to stop? */ … … 686 688 } else 687 689 { 688 Log(("VBoxTray: VBoxDisplayThread 690 Log(("VBoxTray: VBoxDisplayThread: error 0 from DeviceIoControl VBOXGUEST_IOCTL_WAITEVENT\n")); 689 691 /* sleep a bit to not eat too much CPU in case the above call always fails */ 690 692 if (WaitForSingleObject(pCtx->pEnv->hStopEvent, 10) == WAIT_OBJECT_0) … … 700 702 if (DeviceIoControl (gVBoxDriver, VBOXGUEST_IOCTL_CTL_FILTER_MASK, &maskInfo, sizeof (maskInfo), NULL, 0, &cbReturned, NULL)) 701 703 { 702 Log(("VBoxTray: VBoxDisplayThread 704 Log(("VBoxTray: VBoxDisplayThread: DeviceIOControl(CtlMask - not) succeeded\n")); 703 705 } 704 706 else 705 707 { 706 Log(("VBoxTray: VBoxDisplayThread 707 } 708 709 Log(("VBoxTray: VBoxDisplayThread 708 Log(("VBoxTray: VBoxDisplayThread: DeviceIOControl(CtlMask) failed\n")); 709 } 710 711 Log(("VBoxTray: VBoxDisplayThread: finished display change request thread\n")); 710 712 return 0; 711 713 } -
trunk/src/VBox/Additions/WINNT/VBoxTray/VBoxTray.cpp
r32249 r32588 283 283 void WINAPI VBoxServiceStart(void) 284 284 { 285 Log(("VBoxTray: Leaving service main function"));285 Log(("VBoxTray: Entering service main function\n")); 286 286 287 287 VBOXSERVICEENV svcEnv;
Note:
See TracChangeset
for help on using the changeset viewer.
