VirtualBox

Changeset 60273 in vbox for trunk/src


Ignore:
Timestamp:
Mar 31, 2016 11:02:32 AM (9 years ago)
Author:
vboxsync
Message:

HostDrivers: try to purge all usage of __FUNCTION__

Location:
trunk/src/VBox/HostDrivers
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/VBox/HostDrivers/VBoxNetFlt/win/drv/VBoxNetFltM-win.cpp

    r56293 r60273  
    3030    NDIS_STATUS Status = NDIS_STATUS_FAILURE;
    3131
    32     LogFlow(("==>"__FUNCTION__": pNetFlt (0x%p)\n", pNetFlt));
     32    LogFlowFunc(("ENTER: pNetFlt (0x%p)\n", pNetFlt));
    3333
    3434    pNetFlt->u.s.WinIf.hMiniport = MiniportAdapterHandle;
     
    8686    NdisSetEvent(&pNetFlt->u.s.WinIf.MpInitCompleteEvent);
    8787
    88     LogFlow(("<=="__FUNCTION__": pNetFlt (0x%p), Status (0x%x)\n", pNetFlt, Status));
     88    LogFlowFunc(("LEAVE: pNetFlt (0x%p), Status (0x%x)\n", pNetFlt, Status));
    8989
    9090    *OpenErrorStatus = Status;
     
    235235    pNetFlt->u.s.WinIf.hMiniport = hMiniportAdapter;
    236236
    237     LogFlow(("==>"__FUNCTION__" : pNetFlt 0x%p\n", pNetFlt));
     237    LogFlowFunc(("ENTER: pNetFlt 0x%p\n", pNetFlt));
    238238
    239239    Assert(vboxNetFltWinGetOpState(&pNetFlt->u.s.WinIf.MpState) == kVBoxNetDevOpState_Deinitialized);
     
    255255    Status = NDIS_STATUS_SUCCESS;
    256256
    257     LogFlow(("<=="__FUNCTION__" : pNetFlt 0x%p, Status 0x%x\n", pNetFlt, Status));
     257    LogFlowFunc(("pNetFlt 0x%p, Status 0x%x\n", pNetFlt, Status));
    258258
    259259    return Status;
     
    271271    UINT i = 0;
    272272
    273     LogFlow(("==>"__FUNCTION__"\n"));
     273    LogFlowFuncEnter();
    274274
    275275    for (; i < MediumArraySize; i++)
     
    384384    *OpenErrorStatus = Status;
    385385
    386     LogFlow(("<=="__FUNCTION__": Status (0x%x)\n", Status));
     386    LogFlowFunc(("LEAVE: Status (0x%x)\n", Status));
    387387
    388388    return Status;
     
    398398    bool bNetFltActive;
    399399
    400     LogFlow(("==>"__FUNCTION__": pNetFlt (0x%p)\n", pNetFlt));
     400    LogFlowFunc(("ENTER: pNetFlt (0x%p)\n", pNetFlt));
    401401
    402402    Assert(cNumberOfPackets);
     
    498498    }
    499499
    500     LogFlow(("<=="__FUNCTION__": pNetFlt (0x%p)\n", pNetFlt));
     500    LogFlowFunc(("LEAVE: pNetFlt (0x%p)\n", pNetFlt));
    501501}
    502502
     
    600600    NDIS_STATUS Status = NDIS_STATUS_FAILURE;
    601601
    602     LogFlow(("==>"__FUNCTION__": pNetFlt (0x%p), Oid (%s)\n", pNetFlt, vboxNetFltWinMpDumpOid(Oid)));
     602    LogFlowFunc(("ENTER: pNetFlt (0x%p), Oid (%s)\n", pNetFlt, vboxNetFltWinMpDumpOid(Oid)));
    603603
    604604    /* fist check if this is the oid we want to pass down */
     
    638638    }
    639639
    640     LogFlow(("<=="__FUNCTION__": pNetFlt (0x%p), Oid (%s), Status (0x%x)\n", pNetFlt, vboxNetFltWinMpDumpOid(Oid), Status));
     640    LogFlowFunc(("LEAVE: pNetFlt (0x%p), Oid (%s), Status (0x%x)\n", pNetFlt, vboxNetFltWinMpDumpOid(Oid), Status));
    641641
    642642    return Status;
     
    775775    NDIS_STATUS Status = NDIS_STATUS_FAILURE;
    776776
    777     LogFlow(("==>"__FUNCTION__": pNetFlt (0x%p), Oid (%s)\n", pNetFlt, vboxNetFltWinMpDumpOid(Oid)));
     777    LogFlowFunc(("ENTER: pNetFlt (0x%p), Oid (%s)\n", pNetFlt, vboxNetFltWinMpDumpOid(Oid)));
    778778
    779779    switch (Oid)
     
    829829    }
    830830
    831     LogFlow(("<=="__FUNCTION__": pNetFlt (0x%p), Oid (%s), Status (0x%x)\n", pNetFlt, vboxNetFltWinMpDumpOid(Oid), Status));
     831    LogFlowFunc(("LEAVE: pNetFlt (0x%p), Oid (%s), Status (0x%x)\n", pNetFlt, vboxNetFltWinMpDumpOid(Oid), Status));
    832832
    833833    return Status;
     
    906906    ULONG cbInfo = sizeof (u32Info);
    907907
    908     LogFlow(("==>"__FUNCTION__": pNetFlt (0x%p), Oid (%s)\n", pNetFlt, vboxNetFltWinMpDumpOid(Oid)));
     908    LogFlowFunc(("ENTER: pNetFlt (0x%p), Oid (%s)\n", pNetFlt, vboxNetFltWinMpDumpOid(Oid)));
    909909
    910910    *BytesWritten = 0;
     
    11331133
    11341134
    1135     LogFlow(("<=="__FUNCTION__": pNetFlt (0x%p), Oid (%s), Status (0x%x)\n", pNetFlt, vboxNetFltWinMpDumpOid(Oid), Status));
     1135    LogFlowFunc(("LEAVE: pNetFlt (0x%p), Oid (%s), Status (0x%x)\n", pNetFlt, vboxNetFltWinMpDumpOid(Oid), Status));
    11361136
    11371137    return Status;
     
    11481148    NDIS_STATUS Status = NDIS_STATUS_SUCCESS;
    11491149
    1150     LogFlow(("==>"__FUNCTION__": pNetFlt (0x%p), Oid (%s)\n", pNetFlt, vboxNetFltWinMpDumpOid(Oid)));
     1150    LogFlowFunc(("ENTER: pNetFlt (0x%p), Oid (%s)\n", pNetFlt, vboxNetFltWinMpDumpOid(Oid)));
    11511151
    11521152    *BytesRead = 0;
     
    12201220    }
    12211221
    1222     LogFlow(("<=="__FUNCTION__": pNetFlt (0x%p), Oid (%s), Status (0x%x)\n", pNetFlt, vboxNetFltWinMpDumpOid(Oid), Status));
     1222    LogFlowFunc(("LEAVE: pNetFlt (0x%p), Oid (%s), Status (0x%x)\n", pNetFlt, vboxNetFltWinMpDumpOid(Oid), Status));
    12231223
    12241224    return Status;
     
    13301330    PVOID pBufToFree = pInfo->pBufToFree;
    13311331
    1332     LogFlow(("==>"__FUNCTION__": pNetFlt (0x%p)\n", pNetFlt));
     1332    LogFlowFunc(("ENTER: pNetFlt (0x%p)\n", pNetFlt));
    13331333
    13341334    if (pOrigPacket)
     
    13511351    vboxNetFltWinDereferenceWinIf(pNetFlt);
    13521352
    1353     LogFlow(("<=="__FUNCTION__": pNetFlt (0x%p)\n", pNetFlt));
     1353    LogFlowFunc(("LEAVE: pNetFlt (0x%p)\n", pNetFlt));
    13541354}
    13551355
     
    13651365    NDIS_STATUS Status;
    13661366
    1367     LogFlow(("==>"__FUNCTION__": pNetFlt (0x%p)\n", pNetFlt));
     1367    LogFlowFunc(("ENTER: pNetFlt (0x%p)\n", pNetFlt));
    13681368
    13691369    if (vboxNetFltWinGetPowerState(&pNetFlt->u.s.WinIf.PtState) != NdisDeviceStateD0
    13701370            || vboxNetFltWinGetPowerState(&pNetFlt->u.s.WinIf.MpState) != NdisDeviceStateD0)
    13711371    {
    1372         LogFlow(("<=="__FUNCTION__": pNetFlt (0x%p), Status (0x%x)\n", pNetFlt, NDIS_STATUS_FAILURE));
     1372        LogFlowFunc(("LEAVE: pNetFlt (0x%p), Status (0x%x)\n", pNetFlt, NDIS_STATUS_FAILURE));
    13731373        return NDIS_STATUS_FAILURE;
    13741374    }
     
    13771377            ByteOffset, BytesToTransfer, Packet, BytesTransferred);
    13781378
    1379     LogFlow(("<=="__FUNCTION__": pNetFlt (0x%p), Status (0x%x)\n", pNetFlt, Status));
     1379    LogFlowFunc(("LEAVE: pNetFlt (0x%p), Status (0x%x)\n", pNetFlt, Status));
    13801380    return Status;
    13811381#else
    1382     LogFlow(("==>"__FUNCTION__": pNetFlt (0x%p)\n", hContext));
     1382    LogFlowFunc(("ENTER: pNetFlt (0x%p)\n", hContext));
    13831383    /* should never be here */
    13841384    Assert(0);
    1385     LogFlow(("<=="__FUNCTION__": pNetFlt (0x%p), Status (0x%x)\n", hContext, NDIS_STATUS_FAILURE));
     1385    LogFlowFunc(("LEAVE: pNetFlt (0x%p), Status (0x%x)\n", hContext, NDIS_STATUS_FAILURE));
    13861386    return NDIS_STATUS_FAILURE;
    13871387#endif
     
    13931393    NDIS_STATUS Status;
    13941394
    1395     LogFlow(("==>"__FUNCTION__": pNetFlt (0x%p)\n", pNetFlt));
     1395    LogFlowFunc(("ENTER: pNetFlt (0x%p)\n", pNetFlt));
    13961396
    13971397#ifndef VBOXNETADP
     
    14191419    }
    14201420
    1421     LogFlow(("<=="__FUNCTION__": pNetFlt (0x%p)\n", pNetFlt));
     1421    LogFlowFunc(("LEAVE: pNetFlt (0x%p)\n", pNetFlt));
    14221422}
    14231423
  • trunk/src/VBox/HostDrivers/VBoxNetFlt/win/drv/VBoxNetFltP-win.cpp

    r56293 r60273  
    8686            else
    8787            {
    88                 LogRel((__FUNCTION__": vboxNetFltWinMpInitializeDevideInstance failed, Status 0x%x\n", Status));
     88                LogRelFunc(("vboxNetFltWinMpInitializeDevideInstance failed, Status 0x%x\n", Status));
    8989            }
    9090
     
    9696        else
    9797        {
    98             LogRel((__FUNCTION__"NdisOpenAdapter failed, Status (0x%x)", Status));
     98            LogRelFunc(("NdisOpenAdapter failed, Status (0x%x)", Status));
    9999        }
    100100
     
    112112        IN PVOID pvSystemSpecific2)
    113113{
    114     LogFlow(("==>"__FUNCTION__"\n"));
     114    LogFlowFuncEnter();
    115115
    116116    NDIS_STATUS Status;
     
    137137    *pStatus = Status;
    138138
    139     LogFlow(("<=="__FUNCTION__": Status 0x%x\n", Status));
     139    LogFlowFunc(("LEAVE: Status 0x%x\n", Status));
    140140}
    141141
     
    144144    PVBOXNETFLTINS pNetFlt =(PVBOXNETFLTINS)hProtocolBindingContext;
    145145
    146     LogFlow(("==>"__FUNCTION__": pNetFlt (0x%p), Status (0x%x), OpenErrorStatus(0x%x)\n", pNetFlt, Status, OpenErrorStatus));
     146    LogFlowFunc(("ENTER: pNetFlt (0x%p), Status (0x%x), OpenErrorStatus(0x%x)\n", pNetFlt, Status, OpenErrorStatus));
    147147    Assert(pNetFlt->u.s.WinIf.OpenCloseStatus == NDIS_STATUS_SUCCESS);
    148148    Assert(Status == NDIS_STATUS_SUCCESS);
     
    152152        Assert(Status == NDIS_STATUS_SUCCESS);
    153153        if (Status != NDIS_STATUS_SUCCESS)
    154             LogRel((__FUNCTION__" : Open Complete status is 0x%x", Status));
     154            LogRelFunc(("Open Complete status is 0x%x", Status));
    155155    }
    156156    else
    157         LogRel((__FUNCTION__" : Adapter maintained status is 0x%x", pNetFlt->u.s.WinIf.OpenCloseStatus));
     157        LogRelFunc(("Adapter maintained status is 0x%x", pNetFlt->u.s.WinIf.OpenCloseStatus));
    158158    NdisSetEvent(&pNetFlt->u.s.WinIf.OpenCloseEvent);
    159     LogFlow(("<=="__FUNCTION__": pNetFlt (0x%p), Status (0x%x), OpenErrorStatus(0x%x)\n", pNetFlt, Status, OpenErrorStatus));
     159    LogFlowFunc(("LEAVE: pNetFlt (0x%p), Status (0x%x), OpenErrorStatus(0x%x)\n", pNetFlt, Status, OpenErrorStatus));
    160160}
    161161
     
    191191    int cPPUsage;
    192192
    193     LogFlow(("==>"__FUNCTION__": pNetFlt 0x%p\n", pNetFlt));
     193    LogFlowFunc(("ENTER: pNetFlt 0x%p\n", pNetFlt));
    194194
    195195    Assert(KeGetCurrentIrql() == PASSIVE_LEVEL);
     
    244244    }
    245245
    246     LogFlow(("<=="__FUNCTION__": pNetFlt 0x%p\n", pNetFlt));
     246    LogFlowFunc(("LEAVE: pNetFlt 0x%p\n", pNetFlt));
    247247
    248248    return Status;
     
    255255    PVBOXNETFLTINS pNetFlt = (PVBOXNETFLTINS)hContext;
    256256
    257     LogFlow(("==>"__FUNCTION__": pNetFlt (0x%p)\n", pNetFlt));
     257    LogFlowFunc(("ENTER: pNetFlt (0x%p)\n", pNetFlt));
    258258
    259259    *pStatus = vboxNetFltWinDetachFromInterface(pNetFlt, true);
    260260    Assert(*pStatus == NDIS_STATUS_SUCCESS);
    261261
    262     LogFlow(("<=="__FUNCTION__": pNetFlt (0x%p)\n", pNetFlt));
     262    LogFlowFunc(("LEAVE: pNetFlt (0x%p)\n", pNetFlt));
    263263}
    264264
    265265static VOID vboxNetFltWinPtUnloadProtocol()
    266266{
    267     LogFlow(("==>"__FUNCTION__"\n"));
     267    LogFlowFuncEnter();
    268268    NDIS_STATUS Status = vboxNetFltWinPtDeregister(&g_VBoxNetFltGlobalsWin.Pt);
    269269    Assert(Status == NDIS_STATUS_SUCCESS);
    270     LogFlow(("<=="__FUNCTION__": PtDeregister Status (0x%x)\n", Status));
     270    LogFlowFunc(("LEAVE: PtDeregister Status (0x%x)\n", Status));
    271271}
    272272
     
    276276    PVBOXNETFLTINS pNetFlt = (PVBOXNETFLTINS)ProtocolBindingContext;
    277277
    278     LogFlow(("==>"__FUNCTION__" : pNetFlt (0x%p), Status (0x%x)\n", pNetFlt, Status));
     278    LogFlowFunc(("ENTER: pNetFlt (0x%p), Status (0x%x)\n", pNetFlt, Status));
    279279    Assert(pNetFlt->u.s.WinIf.OpenCloseStatus == NDIS_STATUS_SUCCESS);
    280280    Assert(Status == NDIS_STATUS_SUCCESS);
     
    285285    }
    286286    NdisSetEvent(&pNetFlt->u.s.WinIf.OpenCloseEvent);
    287     LogFlow(("<=="__FUNCTION__" : pNetFlt (0x%p), Status (0x%x)\n", pNetFlt, Status));
     287    LogFlowFunc(("LEAVE: pNetFlt (0x%p), Status (0x%x)\n", pNetFlt, Status));
    288288}
    289289
    290290static VOID vboxNetFltWinPtResetComplete(IN NDIS_HANDLE hProtocolBindingContext, IN NDIS_STATUS Status)
    291291{
    292     LogFlow(("==>"__FUNCTION__" : pNetFlt 0x%p, Status 0x%x\n", hProtocolBindingContext, Status));
     292    LogFlowFunc(("ENTER: pNetFlt 0x%p, Status 0x%x\n", hProtocolBindingContext, Status));
    293293    /*
    294294     * should never be here
    295295     */
    296296    Assert(0);
    297     LogFlow(("<=="__FUNCTION__" : pNetFlt 0x%p, Status 0x%x\n", hProtocolBindingContext, Status));
     297    LogFlowFunc(("LEAVE: pNetFlt 0x%p, Status 0x%x\n", hProtocolBindingContext, Status));
    298298}
    299299
     
    486486    NDIS_OID Oid = pNetFlt->u.s.WinIf.PassDownRequest.DATA.SET_INFORMATION.Oid;
    487487
    488     LogFlow(("==>"__FUNCTION__" : pNetFlt (0x%p), pNdisRequest (0x%p), Status (0x%x)\n", pNetFlt, pNdisRequest, Status));
     488    LogFlowFunc(("ENTER: pNetFlt (0x%p), pNdisRequest (0x%p), Status (0x%x)\n", pNetFlt, pNdisRequest, Status));
    489489
    490490    if (pSynchRequest == pNdisRequest)
     
    497497        /* 3. return; */
    498498
    499         LogFlow(("<=="__FUNCTION__" : pNetFlt (0x%p), pNdisRequest (0x%p), Status (0x%x)\n", pNetFlt, pNdisRequest, Status));
     499        LogFlowFunc(("LEAVE: pNetFlt (0x%p), pNdisRequest (0x%p), Status (0x%x)\n", pNetFlt, pNdisRequest, Status));
    500500        return;
    501501    }
     
    522522    }
    523523
    524     LogFlow(("<=="__FUNCTION__" : pNetFlt (0x%p), pNdisRequest (0x%p), Status (0x%x)\n", pNetFlt, pNdisRequest, Status));
     524    LogFlowFunc(("LEAVE: pNetFlt (0x%p), pNdisRequest (0x%p), Status (0x%x)\n", pNetFlt, pNdisRequest, Status));
    525525}
    526526
     
    529529    PVBOXNETFLTINS pNetFlt = (PVBOXNETFLTINS)hProtocolBindingContext;
    530530
    531     LogFlow(("==>"__FUNCTION__" : pNetFlt (0x%p), GeneralStatus (0x%x)\n", pNetFlt, GeneralStatus));
     531    LogFlowFunc(("ENTER: pNetFlt (0x%p), GeneralStatus (0x%x)\n", pNetFlt, GeneralStatus));
    532532
    533533    if (vboxNetFltWinReferenceWinIf(pNetFlt))
     
    556556    }
    557557
    558     LogFlow(("<=="__FUNCTION__" : pNetFlt (0x%p), GeneralStatus (0x%x)\n", pNetFlt, GeneralStatus));
     558    LogFlowFunc(("LEAVE: pNetFlt (0x%p), GeneralStatus (0x%x)\n", pNetFlt, GeneralStatus));
    559559}
    560560
     
    564564    PVBOXNETFLTINS pNetFlt = (PVBOXNETFLTINS)hProtocolBindingContext;
    565565
    566     LogFlow(("==>"__FUNCTION__" : pNetFlt (0x%p)\n", pNetFlt));
     566    LogFlowFunc(("ENTER: pNetFlt (0x%p)\n", pNetFlt));
    567567
    568568    if (vboxNetFltWinReferenceWinIf(pNetFlt))
     
    573573    }
    574574
    575     LogFlow(("<=="__FUNCTION__" : pNetFlt (0x%p)\n", pNetFlt));
     575    LogFlowFunc(("LEAVE: pNetFlt (0x%p)\n", pNetFlt));
    576576}
    577577
     
    582582    PNDIS_PACKET pOrigPacket = pSendInfo->pOrigPacket;
    583583    PVOID pBufToFree = pSendInfo->pBufToFree;
    584     LogFlow(("==>"__FUNCTION__": pNetFlt (0x%p), pPacket (0x%p), Status (0x%x)\n", pNetFlt, pPacket, Status));
     584    LogFlowFunc(("ENTER: pNetFlt (0x%p), pPacket (0x%p), Status (0x%x)\n", pNetFlt, pPacket, Status));
    585585
    586586#if defined(DEBUG_NETFLT_PACKETS) || !defined(VBOX_LOOPBACK_USEFLAGS)
     
    611611    vboxNetFltWinDereferenceWinIf(pNetFlt);
    612612
    613     LogFlow(("<=="__FUNCTION__": pNetFlt (0x%p), pPacket (0x%p), Status (0x%x)\n", pNetFlt, pPacket, Status));
     613    LogFlowFunc(("LEAVE: pNetFlt (0x%p), pPacket (0x%p), Status (0x%x)\n", pNetFlt, pPacket, Status));
    614614}
    615615
     
    745745{
    746746    PVBOXNETFLTINS pNetFlt = (PVBOXNETFLTINS)hProtocolBindingContext;
    747     LogFlow(("==>"__FUNCTION__": pNetFlt (0x%p), pPacket (0x%p), Status (0x%x), cbTransfered (%d)\n", pNetFlt, pPacket, Status, cbTransferred));
     747    LogFlowFunc(("ENTER: pNetFlt (0x%p), pPacket (0x%p), Status (0x%x), cbTransfered (%d)\n", pNetFlt, pPacket, Status, cbTransferred));
    748748    if (!vboxNetFltWinPtTransferDataCompleteActive(pNetFlt, pPacket, Status))
    749749    {
     
    760760    /* else - all processing is done with vboxNetFltWinPtTransferDataCompleteActive already */
    761761
    762     LogFlow(("<=="__FUNCTION__": pNetFlt (0x%p), pPacket (0x%p), Status (0x%x), cbTransfered (%d)\n", pNetFlt, pPacket, Status, cbTransferred));
     762    LogFlowFunc(("LEAVE: pNetFlt (0x%p), pPacket (0x%p), Status (0x%x), cbTransfered (%d)\n", pNetFlt, pPacket, Status, cbTransferred));
    763763}
    764764
     
    10711071    const bool bPassThruActive = !bNetFltActive;
    10721072
    1073     LogFlow(("==>"__FUNCTION__" : pNetFlt (0x%p)\n", pNetFlt));
     1073    LogFlowFunc(("ENTER: pNetFlt (0x%p)\n", pNetFlt));
    10741074
    10751075    if (fWinIfActive)
     
    12151215    }
    12161216
    1217     LogFlow(("<=="__FUNCTION__" : pNetFlt (0x%p)\n", pNetFlt));
     1217    LogFlowFunc(("LEAVE: pNetFlt (0x%p)\n", pNetFlt));
    12181218
    12191219    return Status;
     
    12351235    Assert(iProc < RT_ELEMENTS(pNetFlt->u.s.WinIf.abIndicateRxComplete));
    12361236
    1237     LogFlow(("==>"__FUNCTION__" : pNetFlt (0x%p)\n", pNetFlt));
     1237    LogFlowFunc(("ENTER: pNetFlt (0x%p)\n", pNetFlt));
    12381238
    12391239    if (hMiniport != NULL && pNetFlt->u.s.WinIf.abIndicateRxComplete[iProc])
     
    12661266    }
    12671267
    1268     LogFlow(("<=="__FUNCTION__" : pNetFlt (0x%p)\n", pNetFlt));
     1268    LogFlowFunc(("LEAVE: pNetFlt (0x%p)\n", pNetFlt));
    12691269}
    12701270
     
    12771277    const bool bPassThruActive = !bNetFltActive;
    12781278
    1279     LogFlow(("==>"__FUNCTION__" : pNetFlt (0x%p)\n", pNetFlt));
     1279    LogFlowFunc(("ENTER: pNetFlt (0x%p)\n", pNetFlt));
    12801280
    12811281    if (fWinIfActive)
     
    13901390    }
    13911391
    1392     LogFlow(("<=="__FUNCTION__" : pNetFlt (0x%p), cRefCount (%d)\n", pNetFlt, cRefCount));
     1392    LogFlowFunc(("LEAVE: pNetFlt (0x%p), cRefCount (%d)\n", pNetFlt, cRefCount));
    13931393
    13941394    return cRefCount;
     
    14871487    PVBOXNETFLTINS pNetFlt = (PVBOXNETFLTINS)hProtocolBindingContext;
    14881488
    1489     LogFlow(("==>"__FUNCTION__": pNetFlt (0x%p), NetEvent (%d)\n", pNetFlt, pNetPnPEvent->NetEvent));
     1489    LogFlowFunc(("ENTER: pNetFlt (0x%p), NetEvent (%d)\n", pNetFlt, pNetPnPEvent->NetEvent));
    14901490
    14911491    switch (pNetPnPEvent->NetEvent)
     
    15071507    }
    15081508
    1509     LogFlow(("<=="__FUNCTION__": pNetFlt (0x%p), NetEvent (%d)\n", pNetFlt, pNetPnPEvent->NetEvent));
     1509    LogFlowFunc(("LEAVE: pNetFlt (0x%p), NetEvent (%d)\n", pNetFlt, pNetPnPEvent->NetEvent));
    15101510}
    15111511
  • trunk/src/VBox/HostDrivers/VBoxNetFlt/win/drv/VBoxNetFltRt-win.cpp

    r57937 r60273  
    16651665    UNREFERENCED_PARAMETER(DriverObject);
    16661666
    1667     LogFlow((__FUNCTION__" ==> DO (0x%x)\n", DriverObject));
     1667    LogFlowFunc(("ENTER: DO (0x%x)\n", DriverObject));
    16681668
    16691669    rc = vboxNetFltWinFiniIdc();
     
    16731673        AssertFailed();
    16741674
    1675         Log((__FUNCTION__": vboxNetFltWinFiniIdc - failed, busy.\n"));
     1675        LogFlowFunc(("vboxNetFltWinFiniIdc - failed, busy.\n"));
    16761676    }
    16771677
     
    16871687#endif /* VBOXNETADP */
    16881688
    1689     LogFlow((__FUNCTION__" <== DO (0x%x)\n", DriverObject));
     1689    LogFlow(("LEAVE: DO (0x%x)\n", DriverObject));
    16901690
    16911691    vboxNetFltWinFiniNetFltBase();
     
    19261926#endif
    19271927
    1928     LogFlow(("==>"__FUNCTION__" : pWinIf 0x%p\n", pWinIf));
     1928    LogFlowFunc(("ENTER: pWinIf 0x%p\n", pWinIf));
    19291929
    19301930    Assert(KeGetCurrentIrql() == PASSIVE_LEVEL);
     
    19481948    NdisFreePacketPool(pWinIf->hRecvPacketPool);
    19491949
    1950     LogFlow(("<=="__FUNCTION__" : pWinIf 0x%p\n", pWinIf));
     1950    LogFlowFunc(("LEAVE: pWinIf 0x%p\n", pWinIf));
    19511951}
    19521952
     
    19631963    BOOLEAN bCallFiniOnFail = FALSE;
    19641964
    1965     LogFlow(("==>"__FUNCTION__": pWinIf 0x%p\n", pWinIf));
     1965    LogFlowFunc(("ENTER: pWinIf 0x%p\n", pWinIf));
    19661966
    19671967    Assert(KeGetCurrentIrql() == PASSIVE_LEVEL);
     
    20422042    }
    20432043
    2044     LogFlow(("<=="__FUNCTION__": pWinIf 0x%p, Status 0x%x\n", pWinIf, Status));
     2044    LogFlowFunc(("LEAVE: pWinIf 0x%p, Status 0x%x\n", pWinIf, Status));
    20452045
    20462046    return Status;
     
    26862686    NDIS_STATUS Status;
    26872687    int rc;
    2688     LogFlow((__FUNCTION__": pThis=%0xp\n", pNetFlt));
     2688    LogFlowFunc(("ENTER: pThis=%0xp\n", pNetFlt));
    26892689
    26902690    Assert(KeGetCurrentIrql() < DISPATCH_LEVEL);
     
    27462746    /* release for the retain we made before waining on the mutex */
    27472747    vboxNetFltRelease(pNetFlt, false);
     2748   
     2749    LogFlowFunc(("LEAVE: Status 0x%x\n", Status));
    27482750
    27492751    return Status;
  • trunk/src/VBox/HostDrivers/VBoxUSB/win/dev/VBoxUsbRt.cpp

    r60159 r60273  
    5252    if (bRc)
    5353    {
    54         Log((__FUNCTION__": pDevExt (0x%x) Owner(0x%x) acquired\n", pFObj));
     54        LogFunc(("pDevExt (0x%x) Owner(0x%x) acquired\n", pFObj));
    5555    }
    5656    else
    5757    {
    58         Log((__FUNCTION__": pDevExt (0x%x) Owner(0x%x) FAILED!!\n", pFObj));
     58        LogFunc(("pDevExt (0x%x) Owner(0x%x) FAILED!!\n", pFObj));
    5959    }
    6060    return bRc;
     
    6666    if (bRc)
    6767    {
    68         Log((__FUNCTION__": pDevExt (0x%x) Owner(0x%x) released\n", pFObj));
     68        LogFunc(("pDevExt (0x%x) Owner(0x%x) released\n", pFObj));
    6969    }
    7070    else
    7171    {
    72         Log((__FUNCTION__": pDevExt (0x%x) Owner(0x%x) release: is NOT an owner\n", pFObj));
     72        LogFunc(("pDevExt (0x%x) Owner(0x%x) release: is NOT an owner\n", pFObj));
    7373    }
    7474    return bRc;
     
    11141114        pUrbInfo->len = 0;
    11151115
    1116         Log((__FUNCTION__": URB failed Status (0x%x) urb Status (0x%x)\n", Status, pUrb->UrbHeader.Status));
     1116        LogFunc(("URB failed Status (0x%x) urb Status (0x%x)\n", Status, pUrb->UrbHeader.Status));
    11171117#ifdef DEBUG
    11181118        switch(pContext->ulTransferType)
Note: See TracChangeset for help on using the changeset viewer.

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