VirtualBox

Changeset 58195 in vbox for trunk/src/VBox/Additions/WINNT


Ignore:
Timestamp:
Oct 12, 2015 3:13:47 PM (9 years ago)
Author:
vboxsync
Message:

VBoxGuestR0LibSharedFolders: Prefixed functions ('vbox' wasn't a very good one). Hope I found all places these functions are called...

Location:
trunk/src/VBox/Additions/WINNT/SharedFolders/driver
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • trunk/src/VBox/Additions/WINNT/SharedFolders/driver/file.c

    r55401 r58195  
    4343                                  uint8_t *pBuffer, bool fLocked)
    4444{
    45     return vboxCallRead(pClient, pMap, hFile, offset, pcbBuffer, pBuffer, fLocked);
     45    return VbglR0SfRead(pClient, pMap, hFile, offset, pcbBuffer, pBuffer, fLocked);
    4646}
    4747
    … …  
    5050                                   uint8_t *pBuffer, bool fLocked)
    5151{
    52     return vboxCallWrite(pClient, pMap, hFile, offset, pcbBuffer, pBuffer, fLocked);
     52    return VbglR0SfWrite(pClient, pMap, hFile, offset, pcbBuffer, pBuffer, fLocked);
    5353}
    5454
    … …  
    5757                                 uint16_t offFirstPage, uint16_t cPages, RTGCPHYS64 *paPages)
    5858{
    59     return VbglR0SharedFolderReadPageList(pClient, pMap, hFile, offset, pcbBuffer, offFirstPage, cPages, paPages);
     59    return VbglR0SfReadPageList(pClient, pMap, hFile, offset, pcbBuffer, offFirstPage, cPages, paPages);
    6060}
    6161
    … …  
    6464                                  uint16_t offFirstPage, uint16_t cPages, RTGCPHYS64 *paPages)
    6565{
    66     return VbglR0SharedFolderWritePageList(pClient, pMap, hFile, offset, pcbBuffer, offFirstPage, cPages, paPages);
     66    return VbglR0SfWritePageList(pClient, pMap, hFile, offset, pcbBuffer, offFirstPage, cPages, paPages);
    6767}
    6868
    … …  
    491491        fu32Lock |= SHFL_LOCK_WAIT;
    492492
    493     vboxRC = vboxCallLock(&pDeviceExtension->hgcmClient, &pNetRootExtension->map, pVBoxFobx->hFile,
     493    vboxRC = VbglR0SfLock(&pDeviceExtension->hgcmClient, &pNetRootExtension->map, pVBoxFobx->hFile,
    494494                          LowIoContext->ParamsFor.Locks.ByteOffset, LowIoContext->ParamsFor.Locks.Length, fu32Lock);
    495495
    … …  
    524524
    525525    /* Do the actual flushing of file buffers */
    526     vboxRC = vboxCallFlush(&pDeviceExtension->hgcmClient, &pNetRootExtension->map, pVBoxFobx->hFile);
     526    vboxRC = VbglR0SfFlush(&pDeviceExtension->hgcmClient, &pNetRootExtension->map, pVBoxFobx->hFile);
    527527
    528528    Status = VBoxErrorToNTStatus(vboxRC);
    … …  
    565565    pObjInfo->cbObject = pNewFileSize->QuadPart;
    566566
    567     vboxRC = vboxCallFSInfo(&pDeviceExtension->hgcmClient, &pNetRootExtension->map, pVBoxFobx->hFile,
     567    vboxRC = VbglR0SfFsInfo(&pDeviceExtension->hgcmClient, &pNetRootExtension->map, pVBoxFobx->hFile,
    568568                            SHFL_INFO_SET | SHFL_INFO_SIZE, &cbBuffer, (PSHFLDIRINFO)pObjInfo);
    569569
    570     Log(("VBOXSF: vbsfSetEndOfFile: vboxCallFSInfo returned %Rrc\n", vboxRC));
     570    Log(("VBOXSF: vbsfSetEndOfFile: VbglR0SfFsInfo returned %Rrc\n", vboxRC));
    571571
    572572    Status = VBoxErrorToNTStatus(vboxRC);
    573573    if (Status == STATUS_SUCCESS)
    574574    {
    575         Log(("VBOXSF: vbsfSetEndOfFile: vboxCallFSInfo new allocation size = %RX64\n",
     575        Log(("VBOXSF: vbsfSetEndOfFile: VbglR0SfFsInfo new allocation size = %RX64\n",
    576576             pObjInfo->cbAllocated));
    577577

  • trunk/src/VBox/Additions/WINNT/SharedFolders/driver/info.c

    r55401 r58195  
    165165    cFiles = 0;
    166166
    167     /* vboxCallDirInfo requires a pointer to uint32_t. */
     167    /* VbglR0SfDirInfo requires a pointer to uint32_t. */
    168168    u32BufSize = cbHGCMBuffer;
    169169
    170170    Log(("VBOXSF: MrxQueryDirectory: CallDirInfo: File = 0x%08x, Flags = 0x%08x, Index = %d, u32BufSize = %d\n",
    171171         pVBoxFobx->hFile, fSFFlags, index, u32BufSize));
    172     vboxRC = vboxCallDirInfo(&pDeviceExtension->hgcmClient, &pNetRootExtension->map, pVBoxFobx->hFile,
     172    vboxRC = VbglR0SfDirInfo(&pDeviceExtension->hgcmClient, &pNetRootExtension->map, pVBoxFobx->hFile,
    173173                             ParsedPath, fSFFlags, index, &u32BufSize, (PSHFLDIRINFO)pHGCMBuffer, &cFiles);
    174174    Log(("VBOXSF: MrxQueryDirectory: u32BufSize after CallDirInfo = %d, rc = %Rrc\n",
    … …  
    592592            }
    593593
    594             vboxRC = vboxCallFSInfo(&pDeviceExtension->hgcmClient, &pNetRootExtension->map, pVBoxFobx->hFile,
     594            vboxRC = VbglR0SfFsInfo(&pDeviceExtension->hgcmClient, &pNetRootExtension->map, pVBoxFobx->hFile,
    595595                                    SHFL_INFO_GET | SHFL_INFO_VOLUME, &cbHGCMBuffer, (PSHFLDIRINFO)pHGCMBuffer);
    596596
    … …  
    765765            }
    766766
    767             vboxRC = vboxCallFSInfo(&pDeviceExtension->hgcmClient, &pNetRootExtension->map, pVBoxFobx->hFile,
     767            vboxRC = VbglR0SfFsInfo(&pDeviceExtension->hgcmClient, &pNetRootExtension->map, pVBoxFobx->hFile,
    768768                                    SHFL_INFO_GET | SHFL_INFO_VOLUME, &cbHGCMBuffer, (PSHFLDIRINFO)pHGCMBuffer);
    769769
    … …  
    10981098
    10991099        Assert(pVBoxFobx && pNetRootExtension && pDeviceExtension);
    1100         vboxRC = vboxCallFSInfo(&pDeviceExtension->hgcmClient, &pNetRootExtension->map, pVBoxFobx->hFile,
     1100        vboxRC = VbglR0SfFsInfo(&pDeviceExtension->hgcmClient, &pNetRootExtension->map, pVBoxFobx->hFile,
    11011101                                SHFL_INFO_GET | SHFL_INFO_FILE, &cbHGCMBuffer, (PSHFLDIRINFO)pHGCMBuffer);
    11021102
    … …  
    14291429
    14301430            Assert(pVBoxFobx && pNetRootExtension && pDeviceExtension);
    1431             vboxRC = vboxCallFSInfo(&pDeviceExtension->hgcmClient, &pNetRootExtension->map, pVBoxFobx->hFile,
     1431            vboxRC = VbglR0SfFsInfo(&pDeviceExtension->hgcmClient, &pNetRootExtension->map, pVBoxFobx->hFile,
    14321432                                    SHFL_INFO_SET | SHFL_INFO_FILE, &cbBuffer, (PSHFLDIRINFO)pSHFLFileInfo);
    14331433

  • trunk/src/VBox/Additions/WINNT/SharedFolders/driver/net.c

    r55401 r58195  
    206206            }
    207207
    208             vboxRC = vboxCallMapFolder(&pDeviceExtension->hgcmClient, ParsedPath, &pNetRootExtension->map);
     208            vboxRC = VbglR0SfMapFolder(&pDeviceExtension->hgcmClient, ParsedPath, &pNetRootExtension->map);
    209209            vbsfFreeNonPagedMem(ParsedPath);
    210210            if (vboxRC != VINF_SUCCESS)
    211211            {
    212                 Log(("VBOXSF: MRxCreateVNetRoot: vboxCallMapFolder failed with %d\n", vboxRC));
     212                Log(("VBOXSF: MRxCreateVNetRoot: VbglR0SfMapFolder failed with %d\n", vboxRC));
    213213                Status = STATUS_BAD_NETWORK_NAME;
    214214            }
    … …  
    264264    if (pNetRootExtension->phgcmClient)
    265265    {
    266         int vboxRC = vboxCallUnmapFolder(pNetRootExtension->phgcmClient, &pNetRootExtension->map);
     266        int vboxRC = VbglR0SfUnmapFolder(pNetRootExtension->phgcmClient, &pNetRootExtension->map);
    267267        if (vboxRC != VINF_SUCCESS)
    268             Log(("VBOXSF: MRxFinalizeVNetRoot: vboxCallUnmapFolder failed with %d\n",
     268            Log(("VBOXSF: MRxFinalizeVNetRoot: VbglR0SfUnmapFolder failed with %d\n",
    269269                 vboxRC));
    270270        pNetRootExtension->phgcmClient = NULL;

  • trunk/src/VBox/Additions/WINNT/SharedFolders/driver/path.c

    r55401 r58195  
    261261
    262262        /* Call host. */
    263         Log(("VBOXSF: vbsfProcessCreate: vboxCallCreate called.\n"));
    264         vboxRC = vboxCallCreate(&pDeviceExtension->hgcmClient, &pNetRootExtension->map, ParsedPath, pCreateParms);
     263        Log(("VBOXSF: vbsfProcessCreate: VbglR0SfCreate called.\n"));
     264        vboxRC = VbglR0SfCreate(&pDeviceExtension->hgcmClient, &pNetRootExtension->map, ParsedPath, pCreateParms);
    265265
    266266        vbsfFreeNonPagedMem(ParsedPath);
    267267    }
    268268
    269     Log(("VBOXSF: vbsfProcessCreate: vboxCallCreate returns vboxRC = %Rrc, Result = 0x%x\n",
     269    Log(("VBOXSF: vbsfProcessCreate: VbglR0SfCreate returns vboxRC = %Rrc, Result = 0x%x\n",
    270270         vboxRC, pCreateParms->Result));
    271271
    … …  
    447447    if (pCreateParms && pCreateParms->Handle != SHFL_HANDLE_NIL)
    448448    {
    449         vboxCallClose(&pDeviceExtension->hgcmClient, &pNetRootExtension->map, pCreateParms->Handle);
     449        VbglR0SfClose(&pDeviceExtension->hgcmClient, &pNetRootExtension->map, pCreateParms->Handle);
    450450        *pHandle = SHFL_HANDLE_NIL;
    451451    }
    … …  
    699699        pSHFLFileInfo->Attr.fMode = NTToVBoxFileAttributes(pInfo->FileAttributes);
    700700
    701     vboxRC = vboxCallFSInfo(&pDeviceExtension->hgcmClient, &pNetRootExtension->map, pVBoxFobx->hFile,
     701    vboxRC = VbglR0SfFsInfo(&pDeviceExtension->hgcmClient, &pNetRootExtension->map, pVBoxFobx->hFile,
    702702                            SHFL_INFO_SET | SHFL_INFO_FILE, &cbBuffer, (PSHFLDIRINFO)pSHFLFileInfo);
    703703
    … …  
    745745    }
    746746
    747     vboxRC = vboxCallClose(&pDeviceExtension->hgcmClient,
     747    vboxRC = VbglR0SfClose(&pDeviceExtension->hgcmClient,
    748748                           &pNetRootExtension->map,
    749749                           pVBoxFobx->hFile);
    … …  
    839839
    840840    /* Call host. */
    841     vboxRC = vboxCallRemove(&pDeviceExtension->hgcmClient, &pNetRootExtension->map,
     841    vboxRC = VbglR0SfRemove(&pDeviceExtension->hgcmClient, &pNetRootExtension->map,
    842842                            ParsedPath,
    843843                            (pVBoxFobx->FileStandardInfo.Directory) ? SHFL_REMOVE_DIR : SHFL_REMOVE_FILE);
    … …  
    851851    Status = VBoxErrorToNTStatus(vboxRC);
    852852    if (vboxRC != VINF_SUCCESS)
    853         Log(("VBOXSF: vbsfRemove: vboxCallRemove failed with %Rrc\n", vboxRC));
     853        Log(("VBOXSF: vbsfRemove: VbglR0SfRemove failed with %Rrc\n", vboxRC));
    854854
    855855    Log(("VBOXSF: vbsfRemove: Returned 0x%08X\n", Status));
    … …  
    915915        flags |= SHFL_RENAME_REPLACE_IF_EXISTS;
    916916
    917     Log(("VBOXSF: vbsfRename: Calling vboxCallRename\n"));
    918     vboxRC = vboxCallRename(&pDeviceExtension->hgcmClient, &pNetRootExtension->map, SrcPath, DestPath, flags);
     917    Log(("VBOXSF: vbsfRename: Calling VbglR0SfRename\n"));
     918    vboxRC = VbglR0SfRename(&pDeviceExtension->hgcmClient, &pNetRootExtension->map, SrcPath, DestPath, flags);
    919919
    920920    vbsfFreeNonPagedMem(SrcPath);
    … …  
    923923    Status = VBoxErrorToNTStatus(vboxRC);
    924924    if (vboxRC != VINF_SUCCESS)
    925         Log(("VBOXSF: vbsfRename: vboxCallRename failed with %Rrc\n", vboxRC));
     925        Log(("VBOXSF: vbsfRename: VbglR0SfRename failed with %Rrc\n", vboxRC));
    926926
    927927    Log(("VBOXSF: vbsfRename: Returned 0x%08X\n", Status));

  • trunk/src/VBox/Additions/WINNT/SharedFolders/driver/vbsf.c

    r51997 r58195  
    8282        PMRX_VBOX_DEVICE_EXTENSION pDeviceExtension;
    8383        pDeviceExtension = (PMRX_VBOX_DEVICE_EXTENSION)((PBYTE)VBoxMRxDeviceObject + sizeof(RDBSS_DEVICE_OBJECT));
    84         vboxDisconnect (&pDeviceExtension->hgcmClient);
    85     }
    86 
    87     vboxUninit();
     84        VbglR0SfDisconnect(&pDeviceExtension->hgcmClient);
     85    }
     86
     87    VbglR0SfTerm();
    8888
    8989    if (VBoxMRxDeviceObject)
    … …  
    422422
    423423    /* Initialize VBox subsystem. */
    424     vboxRC = vboxInit();
     424    vboxRC = VbglR0SfInit();
    425425    if (RT_FAILURE(vboxRC))
    426426    {
    … …  
    431431    /* Connect the HGCM client */
    432432    RT_ZERO(hgcmClient);
    433     vboxRC = vboxConnect(&hgcmClient);
     433    vboxRC = VbglR0SfConnect(&hgcmClient);
    434434    if (RT_FAILURE(vboxRC))
    435435    {
    436436        Log(("VBOXSF: DriverEntry: ERROR while connecting to host (%Rrc)!\n",
    437437             vboxRC));
    438         vboxUninit();
     438        VbglR0SfTerm();
    439439        return STATUS_UNSUCCESSFUL;
    440440    }
    … …  
    555555    Log(("VBOXSF: DriverEntry: Failure! Status = 0x%08X\n", Status));
    556556
    557     vboxDisconnect(&hgcmClient);
    558     vboxUninit();
     557    VbglR0SfDisconnect(&hgcmClient);
     558    VbglR0SfTerm();
    559559
    560560    if (VBoxMRxDeviceObject)
    … …  
    711711                        uint32_t cMappings = RT_ELEMENTS(mappings);
    712712
    713                         int vboxRC = vboxCallQueryMappings(&pDeviceExtension->hgcmClient, mappings, &cMappings);
     713                        int vboxRC = VbglR0SfQueryMappings(&pDeviceExtension->hgcmClient, mappings, &cMappings);
    714714
    715715                        if (vboxRC == VINF_SUCCESS)
    … …  
    838838                        break;
    839839
    840                     vboxRC = vboxCallQueryMapName(&pDeviceExtension->hgcmClient,
     840                    vboxRC = VbglR0SfQueryMapName(&pDeviceExtension->hgcmClient,
    841841                                                  (*pConnectId) & ~0x80 /** @todo fix properly */,
    842842                                                  pString, ShflStringSizeOfBuffer(pString));
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