VirtualBox

Changeset 30013 in vbox


Ignore:
Timestamp:
Jun 3, 2010 2:40:59 PM (15 years ago)
Author:
vboxsync
svn:sync-xref-src-repo-rev:
62335
Message:

scm cleanup.

Location:
trunk
Files:
32 edited

Legend:

Unmodified
Added
Removed

  • trunk/include/VBox/HostServices/GuestControlSvc.h

    r29785 r30013  
    175175    /**
    176176     * Guest disconnected (terminated normally or due to a crash HGCM
    177      * detected when calling service::clientDisconnect(). 
     177     * detected when calling service::clientDisconnect().
    178178     */
    179179    GUEST_DISCONNECTED = 3,

  • trunk/include/VBox/feature.h

    • Property svn:eol-style set to native

  • trunk/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR3LibGuestCtrl.cpp

    r29516 r30013  
    257257    VbglHGCMParmUInt32Set(&Msg.context, 0); /** @todo Put this some header struct! */
    258258    VbglHGCMParmUInt32Set(&Msg.pid, 0);
    259     VbglHGCMParmUInt32Set(&Msg.handle, 0);   
     259    VbglHGCMParmUInt32Set(&Msg.handle, 0);
    260260    VbglHGCMParmUInt32Set(&Msg.flags, 0);
    261261
    … …  
    273273            Msg.pid.GetUInt32(puPID);
    274274            Msg.handle.GetUInt32(puHandle);
    275             Msg.flags.GetUInt32(puFlags);           
     275            Msg.flags.GetUInt32(puFlags);
    276276        }
    277277    }

  • trunk/src/VBox/Additions/common/VBoxService/VBoxServiceControl.cpp

    r29594 r30013  
    306306    /*
    307307     * Ask the host service to cancel all pending requests so that we can
    308      * shutdown properly here. 
     308     * shutdown properly here.
    309309     */
    310310    if (g_GuestControlSvcClientID)

  • trunk/src/VBox/Additions/common/VBoxService/VBoxServiceControlExec.cpp

    r29842 r30013  
    753753    int  rc = VINF_SUCCESS;
    754754#ifdef RT_OS_WINDOWS
    755     /* 
     755    /*
    756756     * If sysprep should be executed do this in the context of VBoxService, which
    757757     * (usually, if started by SCM) has administrator rights. Because of that a UI

  • trunk/src/VBox/Additions/common/VBoxService/VBoxServiceCpuHotPlug.cpp

    r29503 r30013  
    109109
    110110/** All possible combinations. */
    111 SYSFSCPUPATH g_aAcpiCpuPath[] = 
     111SYSFSCPUPATH g_aAcpiCpuPath[] =
    112112{
    113113    /** Level 1 */

  • trunk/src/VBox/Additions/common/VBoxService/VBoxServicePageSharing.cpp

    r29996 r30013  
    249249    if (RT_FAILURE(rc))
    250250        VBoxServiceVerbose(3, "VbglR3RegisterSharedModule failed with %d\n", rc);
    251    
     251
    252252end:
    253253    RTMemFree(pVersionInfo);
    … …  
    291291        /** todo when changing this make sure VBoxService.exe is excluded! */
    292292        char *pszDot = strrchr(ModuleInfo.szModule, '.');
    293         if (    pszDot 
     293        if (    pszDot
    294294            &&  (pszDot[1] == 'e' || pszDot[1] == 'E'))
    295295            continue;   /* ignore executables for now. */
    … …  
    374374        PVOID                pBuffer = NULL;
    375375        PRTL_PROCESS_MODULES pSystemModules;
    376    
     376
    377377        NTSTATUS ret = ZwQuerySystemInformation(SystemModuleInformation, (PVOID)&cbBuffer, 0, &cbBuffer);
    378378        if (!cbBuffer)
    … …  
    381381            goto skipkernelmodules;
    382382        }
    383        
     383
    384384        pBuffer = RTMemAllocZ(cbBuffer);
    385385        if (!pBuffer)
    … …  
    392392            goto skipkernelmodules;
    393393        }
    394    
     394
    395395        pSystemModules = (PRTL_PROCESS_MODULES)pBuffer;
    396396        for (unsigned i = 0; i < pSystemModules->NumberOfModules; i++)
    … …  
    401401
    402402            char *pszDot = strrchr(pSystemModules->Modules[i].FullPathName, '.');
    403             if (    pszDot 
     403            if (    pszDot
    404404                &&  (pszDot[1] == 'e' || pszDot[1] == 'E'))
    405405                continue;   /* ignore executables for now. */
    … …  
    534534#if defined(RT_OS_WINDOWS) && !defined(TARGET_NT4)
    535535    hNtdll = LoadLibrary("ntdll.dll");
    536    
     536
    537537    if (hNtdll)
    538538        ZwQuerySystemInformation = (PFNZWQUERYSYSTEMINFORMATION)GetProcAddress(hNtdll, "ZwQuerySystemInformation");
    … …  
    559559     * We have to use this feature as we can't simply execute all init code in our service process.
    560560     *
    561         */
     561    */
    562562    int rc = RTSemEventMultiWait(g_PageSharingEvent, 60000);
    563563    if (*pfShutdown)

  • trunk/src/VBox/Additions/common/VBoxService/VBoxServicePropCache.cpp

    r29885 r30013  
    310310            if ((pNode->fFlags & VBOXSERVICEPROPCACHEFLAG_TEMPORARY) == 0)
    311311                VBoxServiceWritePropF(pCache->uClientID, pNode->pszName, pNode->pszValueReset);
    312    
     312
    313313            AssertPtr(pNode->pszName);
    314314            RTStrFree(pNode->pszName);
    … …  
    316316            RTStrFree(pNode->pszValueReset);
    317317            pNode->fFlags = 0;
    318    
     318
    319319            PVBOXSERVICEVEPROPCACHEENTRY pNext = RTListNodeGetNext(&pNode->Node, VBOXSERVICEVEPROPCACHEENTRY, Node);
    320320            RTListNodeRemove(&pNode->Node);
    321321            RTMemFree(pNode);
    322    
     322
    323323            if (pNext && RTListNodeIsLast(&pCache->ListEntries, &pNext->Node))
    324324                break;

  • trunk/src/VBox/Additions/common/VBoxService/VBoxServiceVMInfo-win.cpp

    r29872 r30013  
    384384                              &enmOwnerType))
    385385        {
    386             VBoxServiceError("VMInfo/Users: Failed looking up account info for user '%ls': %ld!\n", 
     386            VBoxServiceError("VMInfo/Users: Failed looking up account info for user '%ls': %ld!\n",
    387387                             a_pUserInfo->wszUser, GetLastError());
    388388        }
    … …  
    437437            }
    438438        }
    439     }   
     439    }
    440440
    441441    LsaFreeReturnBuffer(pSessionData);

  • trunk/src/VBox/Additions/common/VBoxService/VBoxServiceVMInfo.cpp

    r29861 r30013  
    269269        VBoxServicePropCacheUpdate(&g_VMInfoPropCache, "/VirtualBox/GuestInfo/OS/NoLoggedInUsers", cUsersInList == 0 ? "true" : "false");
    270270        g_cVMInfoLoggedInUsers = cUsersInList;
    271     }   
     271    }
    272272    if (pszUserList)
    273273        RTStrFree(pszUserList);

  • trunk/src/VBox/Devices/EFI/Firmware2/VBoxPkg/VBoxAppleSim/ConsoleControl.h

    r29085 r30013  
    2727 * THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
    2828 * WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.
    29  * 
     29 *
    3030 * Module Name:
    3131 *

  • trunk/src/VBox/Devices/Input/DevPS2.cpp

    r28909 r30013  
    293293    irq1_level = 0;
    294294    irq12_level = 0;
    295    
     295
    296296    /* Determine new OBF state, but only if OBF is clear. If OBF was already
    297297     * set, we cannot risk changing the event type after an ISR potentially
    … …  
    316316            if (s->mode & KBD_MODE_MOUSE_INT)
    317317                irq12_level = 1;
    318         } 
    319         else 
     318        }
     319        else
    320320        {   /* KBD_STAT_OBF set but KBD_STAT_MOUSE_OBF isn't. */
    321321            if ((s->mode & KBD_MODE_KBD_INT) && !(s->mode & KBD_MODE_DISABLE_KBD))

  • trunk/src/VBox/Devices/Network/DevE1000.cpp

    r29685 r30013  
    26492649 *        queuing thousands of items per second here in a normal transmit
    26502650 *        scenario.  Expect performance changes when fixing this! */
    2651 #ifdef IN_RING3 
     2651#ifdef IN_RING3
    26522652            /* Signal that we have more receive descriptors avalable. */
    26532653            e1kWakeupReceive(pState->CTX_SUFF(pDevIns));

  • trunk/src/VBox/Devices/Network/slirp/bootp.c

    r29656 r30013  
    657657     */
    658658    if (   !pData->fUseHostResolver
    659            && (   pData->dnsLastUpdate == 0 
     659           && (   pData->dnsLastUpdate == 0
    660660               || curtime - pData->dnsLastUpdate > 60 * 1000)) /* one minute*/
    661661    {

  • trunk/src/VBox/Devices/Network/slirp/misc.c

    r28800 r30013  
    352352    int fExhausted;
    353353    RTCritSectEnter(&zone->csZone);
    354     fExhausted = (zone->cur_items == zone->max_items); 
     354    fExhausted = (zone->cur_items == zone->max_items);
    355355    RTCritSectLeave(&zone->csZone);
    356356    return fExhausted;

  • trunk/src/VBox/Devices/Network/slirp/socket.c

    r29968 r30013  
    729729             *  Note: Here we can't check if dnsproxy's sent initial request
    730730             */
    731             if (   pData->fUseDnsProxy 
     731            if (   pData->fUseDnsProxy
    732732                && so->so_fport == RT_H2N_U16_C(53))
    733733                dnsproxy_answer(pData, so, m);

  • trunk/src/VBox/Devices/Serial/DevSerial.cpp

    r29892 r30013  
    307307         * hardware. */
    308308        tmp_iir = UART_IIR_CTI;
    309     } else if (   (s->ier & UART_IER_RDI) 
     309    } else if (   (s->ier & UART_IER_RDI)
    310310               && (s->lsr & UART_LSR_DR)
    311311               && (   !(s->fcr & UART_FCR_FE)

  • trunk/src/VBox/Devices/Storage/ATAController.cpp

    r29941 r30013  
    51495149     * required as well as optional.
    51505150     */
    5151    
     5151
    51525152    pIf->pDrvBase = pDrvBase;
    51535153    if (pDrvBase)

  • trunk/src/VBox/Devices/VMMDev/VMMDev.cpp

    r29751 r30013  
    17731773            {
    17741774                pRequestHeader->rc = PGMR3SharedModuleRegister(PDMDevHlpGetVM(pDevIns), pReqModule->enmGuestOS, pReqModule->szName, pReqModule->szVersion,
    1775                                                                pReqModule->GCBaseAddr, pReqModule->cbModule,                                                               
     1775                                                               pReqModule->GCBaseAddr, pReqModule->cbModule,
    17761776                                                               pReqModule->cRegions, pReqModule->aRegions);
    17771777            }
    … …  
    17891789            else
    17901790            {
    1791                 pRequestHeader->rc = PGMR3SharedModuleUnregister(PDMDevHlpGetVM(pDevIns), pReqModule->szName, pReqModule->szVersion, 
     1791                pRequestHeader->rc = PGMR3SharedModuleUnregister(PDMDevHlpGetVM(pDevIns), pReqModule->szName, pReqModule->szVersion,
    17921792                                                                 pReqModule->GCBaseAddr, pReqModule->cbModule);
    17931793            }

  • trunk/src/VBox/Frontends/VBoxManage/VBoxManageGuestCtrl.cpp

    r29807 r30013  
    7070             "                            [--arguments \"<arguments>\"]\n"
    7171             "                            [--environment \"<NAME>=<VALUE> [<NAME>=<VALUE>]\"]\n"
    72              "                            [--flags <flags>] [--timeout <msec>]\n"             
     72             "                            [--flags <flags>] [--timeout <msec>]\n"
    7373             "                            [--verbose] [--wait-for exit,stdout,stderr||]\n"
    7474             "\n");

  • trunk/src/VBox/HostDrivers/VBoxNetFlt/win/notifyobj/VBoxNetFltNotify.rc

    r29025 r30013  
    5454END
    5555
    56 
    57 

  • trunk/src/VBox/HostServices/GuestControl/service.cpp

    r29900 r30013  
    440440    {
    441441        if (itCall->mClientID == u32ClientID)
    442         {       
     442        {
    443443            itCall = mClientWaiterList.erase(itCall);
    444444        }

  • trunk/src/VBox/Main/KeyboardImpl.cpp

    r28909 r30013  
    170170    if (!pUpPort)
    171171        return rc;
    172    
     172
    173173    int vrc = pUpPort->pfnPutEvent(pUpPort, (uint8_t)scancode);
    174174

  • trunk/src/VBox/Main/glue/tests/Makefile.kmk

    • Property svn:keywords set to Id Revision
    r29788 r30013  
    2727 JACOB_JAR=$(JACOB_DIR)/jacob.jar
    2828 CLASSPATH += $(JACOB_JAR)$(SEP)
    29  JAVA_ARGS += -Djava.library.path=$(JACOB_DIR) 
     29 JAVA_ARGS += -Djava.library.path=$(JACOB_DIR)
    3030endif
    3131
    … …  
    3838endif
    3939
    40 JAVA_ARGS += -Dvbox.home=$(VBOX_BIN) 
     40JAVA_ARGS += -Dvbox.home=$(VBOX_BIN)
    4141CLASSPATH  := $(CLASSPATH)$(VBOX_JAR)$(SEP).
    4242

  • trunk/src/VBox/Main/include/VirtualBoxErrorInfoImpl.h

    r29753 r30013  
    6060
    6161    STDMETHOD(GetTypeInfo)(UINT iInfo, LCID Lcid, ITypeInfo **ppTypeInfo)
    62         {
     62    {
    6363        return idi::GetTypeInfo(iInfo, Lcid, ppTypeInfo);
    64         }
     64    }
    6565
    66         STDMETHOD(GetIDsOfNames)(REFIID rIID, LPOLESTR *papwszNames, UINT cNames, LCID Lcid, DISPID *paDispIDs)
    67         {
     66    STDMETHOD(GetIDsOfNames)(REFIID rIID, LPOLESTR *papwszNames, UINT cNames, LCID Lcid, DISPID *paDispIDs)
     67    {
    6868        return idi::GetIDsOfNames(rIID, papwszNames, cNames, Lcid, paDispIDs);
    69         }
     69    }
    7070
    71         STDMETHOD(Invoke)(DISPID idDispMember, REFIID rIID, LCID Lcid, WORD fw, DISPPARAMS *pDispParams,
     71    STDMETHOD(Invoke)(DISPID idDispMember, REFIID rIID, LCID Lcid, WORD fw, DISPPARAMS *pDispParams,
    7272                      VARIANT *pVarResult, EXCEPINFO *pExcepInfo, UINT *piErrArg)
    73         {
    74                 return idi::Invoke(idDispMember, rIID, Lcid, fw, pDispParams, pVarResult, pExcepInfo, piErrArg);
    75         }
     73    {
     74        return idi::Invoke(idDispMember, rIID, Lcid, fw, pDispParams, pVarResult, pExcepInfo, piErrArg);
     75    }
    7676
    7777#else // defined(VBOX_WITH_XPCOM)

  • trunk/src/VBox/Runtime/r0drv/nt/initterm-r0drv-nt.cpp

    r29738 r30013  
    185185            g_cbrtNtPbQuantumEnd     = 1;
    186186            g_offrtNtPbDpcQueueDepth = 0x19e0 + 0xc;
    187         }       
     187        }
    188188        else if (   BuildNumber == 3790                         /* Server 2003 SP2 */
    189189                 && !memcmp(&pbPrcb[0xb60], &u.szVendor[0], 4*3))

  • trunk/src/VBox/Runtime/r0drv/solaris/semmutex-r0drv-solaris.c

    r29284 r30013  
    387387}
    388388
    389 

  • trunk/src/VBox/Runtime/r3/win/RTSystemQueryDmiString-win.cpp

    r29578 r30013  
    6060                                   EOAC_NONE,                   /* Additional capabilities. */
    6161                                   NULL);                       /* Reserved. */
    62         if (hrc == RPC_E_TOO_LATE) 
     62        if (hrc == RPC_E_TOO_LATE)
    6363            hrc = S_OK;
    6464    }

  • trunk/src/VBox/Runtime/r3/win/process-win.cpp

    r29912 r30013  
    529529        HANDLE hTokenLogon = INVALID_HANDLE_VALUE;
    530530        fRc = LogonUserW(pwszUser,
    531                          /* 
     531                         /*
    532532                          * Because we have to deal with http://support.microsoft.com/kb/245683
    533533                          * for NULL domain names when running on NT4 here, pass an empty string if so.
    534                           * However, passing FQDNs should work! 
     534                          * However, passing FQDNs should work!
    535535                          */
    536536                         ((DWORD)(LOBYTE(LOWORD(GetVersion()))) < 5)  /* < Windows 2000. */
    … …  
    657657                break;
    658658
    659             case ERROR_PASSWORD_EXPIRED:           
     659            case ERROR_PASSWORD_EXPIRED:
    660660            case ERROR_ACCOUNT_RESTRICTION: /* See: http://support.microsoft.com/kb/303846/ */
    661661                rc = VERR_LOGON_FAILURE;

  • trunk/src/VBox/VMM/PGMPool.cpp

    r29888 r30013  
    754754     */
    755755    for (unsigned i = 0; i < RT_ELEMENTS(pPool->aIdxDirtyPages); i++)
    756         {
     756    {
    757757        PPGMPOOLPAGE pPage;
    758758        unsigned     idxPage;
    … …  
    777777
    778778        pPool->aIdxDirtyPages[i] = NIL_PGMPOOL_IDX;
    779         }
     779    }
    780780
    781781    /* Clear all dirty pages. */

  • trunk/src/VBox/VMM/PGMSharedPage.cpp

    r30009 r30013  
    5656
    5757    Log(("PGMR3SharedModuleRegister family=%d name=%s version=%s base=%RGv size=%x cRegions=%d\n", enmGuestOS, pszModuleName, pszVersion, GCBaseAddr, cbModule, cRegions));
    58          
     58
    5959    /* Sanity check. */
    6060    AssertReturn(cRegions < VMMDEVSHAREDREGIONDESC_MAX, VERR_INVALID_PARAMETER);
    … …  
    107107    pReq = (PGMMUNREGISTERSHAREDMODULEREQ)RTMemAllocZ(sizeof(*pReq));
    108108    AssertReturn(pReq, VERR_NO_MEMORY);
    109    
     109
    110110    pReq->GCBaseAddr    = GCBaseAddr;
    111111    pReq->cbModule      = cbModule;
    … …  
    120120    RTMemFree(pReq);
    121121    return rc;
    122 #else 
     122#else
    123123    return VERR_NOT_IMPLEMENTED;
    124124#endif
    … …  
    154154 */
    155155static DECLCALLBACK(void) pgmR3CheckSharedModulesHelper(PVM pVM)
    156 {   
     156{
    157157    /* We must stall other VCPUs as we'd otherwise have to send IPI flush commands for every single change we make. */
    158158    int rc = VMMR3EmtRendezvous(pVM, VMMEMTRENDEZVOUS_FLAGS_TYPE_ONCE, pgmR3SharedModuleRegRendezvous, NULL);
    … …  
    172172    /* Queue the actual registration as we are under the IOM lock right now. Perform this operation on the way out. */
    173173    return VMR3ReqCallNoWait(pVM, VMMGetCpuId(pVM), (PFNRT)pgmR3CheckSharedModulesHelper, 1, pVM);
    174 #else 
     174#else
    175175    return VERR_NOT_IMPLEMENTED;
    176176#endif

  • trunk/src/VBox/VMM/VMMR0/PGMR0SharedPage.cpp

    • Property svn:eol-style set to native
    • Property svn:keywords set to Id Revision
    r29741 r30013  
    1 /* $Id: PGMR0.cpp 61539 2010-05-12 15:11:09Z sandervl $ */
     1/* $Id$ */
    22/** @file
    33 * PGM - Page Manager and Monitor, Ring-0.
    … …  
    115115            if (RT_FAILURE(rc))
    116116                break;
    117                
     117
    118118            for (unsigned i = 0; i < idxPage; i++)
    119119            {
Note: See TracChangeset for help on using the changeset viewer.

© 2025 Oracle Support Privacy / Do Not Sell My Info Terms of Use Trademark Policy Automated Access Etiquette