Index: /trunk/src/VBox/Additions/WINNT/SharedFolders/driver/file.c =================================================================== --- /trunk/src/VBox/Additions/WINNT/SharedFolders/driver/file.c (revision 58195) +++ /trunk/src/VBox/Additions/WINNT/SharedFolders/driver/file.c (revision 58196) @@ -28,10 +28,10 @@ -typedef int FNVBSFTRANSFERBUFFER(PVBSFCLIENT pClient, PVBSFMAP pMap, SHFLHANDLE hFile, +typedef int FNVBSFTRANSFERBUFFER(PVBGLSFCLIENT pClient, PVBGLSFMAP pMap, SHFLHANDLE hFile, uint64_t offset, uint32_t *pcbBuffer, uint8_t *pBuffer, bool fLocked); typedef FNVBSFTRANSFERBUFFER *PFNVBSFTRANSFERBUFFER; -typedef int FNVBSFTRANSFERPAGES(PVBSFCLIENT pClient, PVBSFMAP pMap, SHFLHANDLE hFile, +typedef int FNVBSFTRANSFERPAGES(PVBGLSFCLIENT pClient, PVBGLSFMAP pMap, SHFLHANDLE hFile, uint64_t offset, uint32_t *pcbBuffer, uint16_t offFirstPage, uint16_t cPages, RTGCPHYS64 *paPages); @@ -39,5 +39,5 @@ -static int vbsfTransferBufferRead(PVBSFCLIENT pClient, PVBSFMAP pMap, SHFLHANDLE hFile, +static int vbsfTransferBufferRead(PVBGLSFCLIENT pClient, PVBGLSFMAP pMap, SHFLHANDLE hFile, uint64_t offset, uint32_t *pcbBuffer, uint8_t *pBuffer, bool fLocked) @@ -46,5 +46,5 @@ } -static int vbsfTransferBufferWrite(PVBSFCLIENT pClient, PVBSFMAP pMap, SHFLHANDLE hFile, +static int vbsfTransferBufferWrite(PVBGLSFCLIENT pClient, PVBGLSFMAP pMap, SHFLHANDLE hFile, uint64_t offset, uint32_t *pcbBuffer, uint8_t *pBuffer, bool fLocked) @@ -53,5 +53,5 @@ } -static int vbsfTransferPagesRead(PVBSFCLIENT pClient, PVBSFMAP pMap, SHFLHANDLE hFile, +static int vbsfTransferPagesRead(PVBGLSFCLIENT pClient, PVBGLSFMAP pMap, SHFLHANDLE hFile, uint64_t offset, uint32_t *pcbBuffer, uint16_t offFirstPage, uint16_t cPages, RTGCPHYS64 *paPages) @@ -60,5 +60,5 @@ } -static int vbsfTransferPagesWrite(PVBSFCLIENT pClient, PVBSFMAP pMap, SHFLHANDLE hFile, +static int vbsfTransferPagesWrite(PVBGLSFCLIENT pClient, PVBGLSFMAP pMap, SHFLHANDLE hFile, uint64_t offset, uint32_t *pcbBuffer, uint16_t offFirstPage, uint16_t cPages, RTGCPHYS64 *paPages) @@ -70,6 +70,6 @@ typedef struct VBSFTRANSFERCTX { - PVBSFCLIENT pClient; - PVBSFMAP pMap; + PVBGLSFCLIENT pClient; + PVBGLSFMAP pMap; SHFLHANDLE hFile; uint64_t offset; Index: /trunk/src/VBox/Additions/WINNT/SharedFolders/driver/vbsf.c =================================================================== --- /trunk/src/VBox/Additions/WINNT/SharedFolders/driver/vbsf.c (revision 58195) +++ /trunk/src/VBox/Additions/WINNT/SharedFolders/driver/vbsf.c (revision 58196) @@ -411,5 +411,5 @@ ULONG i; int vboxRC; - VBSFCLIENT hgcmClient; + VBGLSFCLIENT hgcmClient; Log(("VBOXSF: DriverEntry: Driver object %p\n", DriverObject)); Index: /trunk/src/VBox/Additions/WINNT/SharedFolders/driver/vbsf.h =================================================================== --- /trunk/src/VBox/Additions/WINNT/SharedFolders/driver/vbsf.h (revision 58195) +++ /trunk/src/VBox/Additions/WINNT/SharedFolders/driver/vbsf.h (revision 58196) @@ -66,5 +66,5 @@ /* The HGCM client information. */ - VBSFCLIENT hgcmClient; + VBGLSFCLIENT hgcmClient; /* Saved pointer to the original IRP_MJ_DEVICE_CONTROL handler. */ @@ -79,8 +79,8 @@ { /* The pointert to HGCM client information in device extension. */ - VBSFCLIENT *phgcmClient; + VBGLSFCLIENT *phgcmClient; /* The shared folder map handle of this netroot. */ - VBSFMAP map; + VBGLSFMAP map; } MRX_VBOX_NETROOT_EXTENSION, *PMRX_VBOX_NETROOT_EXTENSION; Index: /trunk/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR0LibSharedFolders.c =================================================================== --- /trunk/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR0LibSharedFolders.c (revision 58195) +++ /trunk/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR0LibSharedFolders.c (revision 58196) @@ -70,5 +70,5 @@ } -DECLVBGL(int) VbglR0SfConnect(PVBSFCLIENT pClient) +DECLVBGL(int) VbglR0SfConnect(PVBGLSFCLIENT pClient) { int rc; @@ -94,5 +94,5 @@ } -DECLVBGL(void) VbglR0SfDisconnect(PVBSFCLIENT pClient) +DECLVBGL(void) VbglR0SfDisconnect(PVBGLSFCLIENT pClient) { int rc; @@ -113,5 +113,5 @@ } -DECLVBGL(int) VbglR0SfQueryMappings(PVBSFCLIENT pClient, SHFLMAPPING paMappings[], uint32_t *pcMappings) +DECLVBGL(int) VbglR0SfQueryMappings(PVBGLSFCLIENT pClient, SHFLMAPPING paMappings[], uint32_t *pcMappings) { int rc; @@ -141,5 +141,5 @@ } -DECLVBGL(int) VbglR0SfQueryMapName(PVBSFCLIENT pClient, SHFLROOT root, SHFLSTRING *pString, uint32_t size) +DECLVBGL(int) VbglR0SfQueryMapName(PVBGLSFCLIENT pClient, SHFLROOT root, SHFLSTRING *pString, uint32_t size) { int rc; @@ -163,5 +163,5 @@ } -DECLVBGL(int) VbglR0SfMapFolder(PVBSFCLIENT pClient, PSHFLSTRING szFolderName, PVBSFMAP pMap) +DECLVBGL(int) VbglR0SfMapFolder(PVBGLSFCLIENT pClient, PSHFLSTRING szFolderName, PVBGLSFMAP pMap) { int rc; @@ -221,5 +221,5 @@ } -DECLVBGL(int) VbglR0SfUnmapFolder(PVBSFCLIENT pClient, PVBSFMAP pMap) +DECLVBGL(int) VbglR0SfUnmapFolder(PVBGLSFCLIENT pClient, PVBGLSFMAP pMap) { int rc; @@ -238,5 +238,5 @@ } -DECLVBGL(int) VbglR0SfCreate(PVBSFCLIENT pClient, PVBSFMAP pMap, PSHFLSTRING pParsedPath, PSHFLCREATEPARMS pCreateParms) +DECLVBGL(int) VbglR0SfCreate(PVBGLSFCLIENT pClient, PVBGLSFMAP pMap, PSHFLSTRING pParsedPath, PSHFLCREATEPARMS pCreateParms) { /** @todo copy buffers to physical or mapped memory. */ @@ -264,5 +264,5 @@ } -DECLVBGL(int) VbglR0SfClose(PVBSFCLIENT pClient, PVBSFMAP pMap, SHFLHANDLE Handle) +DECLVBGL(int) VbglR0SfClose(PVBGLSFCLIENT pClient, PVBGLSFMAP pMap, SHFLHANDLE Handle) { int rc; @@ -284,5 +284,5 @@ } -DECLVBGL(int) VbglR0SfRemove(PVBSFCLIENT pClient, PVBSFMAP pMap, PSHFLSTRING pParsedPath, uint32_t flags) +DECLVBGL(int) VbglR0SfRemove(PVBGLSFCLIENT pClient, PVBGLSFMAP pMap, PSHFLSTRING pParsedPath, uint32_t flags) { int rc = VINF_SUCCESS; @@ -309,5 +309,5 @@ } -DECLVBGL(int) VbglR0SfRename(PVBSFCLIENT pClient, PVBSFMAP pMap, PSHFLSTRING pSrcPath, PSHFLSTRING pDestPath, uint32_t flags) +DECLVBGL(int) VbglR0SfRename(PVBGLSFCLIENT pClient, PVBGLSFMAP pMap, PSHFLSTRING pSrcPath, PSHFLSTRING pDestPath, uint32_t flags) { int rc; @@ -337,5 +337,5 @@ } -DECLVBGL(int) VbglR0SfRead(PVBSFCLIENT pClient, PVBSFMAP pMap, SHFLHANDLE hFile, +DECLVBGL(int) VbglR0SfRead(PVBGLSFCLIENT pClient, PVBGLSFMAP pMap, SHFLHANDLE hFile, uint64_t offset, uint32_t *pcbBuffer, uint8_t *pBuffer, bool fLocked) { @@ -368,5 +368,5 @@ } -DECLVBGL(int) VbglR0SfReadPageList(PVBSFCLIENT pClient, PVBSFMAP pMap, SHFLHANDLE hFile, uint64_t offset, uint32_t *pcbBuffer, +DECLVBGL(int) VbglR0SfReadPageList(PVBGLSFCLIENT pClient, PVBGLSFMAP pMap, SHFLHANDLE hFile, uint64_t offset, uint32_t *pcbBuffer, uint16_t offFirstPage, uint16_t cPages, RTGCPHYS64 *paPages) { @@ -414,5 +414,5 @@ } -DECLVBGL(int) VbglR0SfWrite(PVBSFCLIENT pClient, PVBSFMAP pMap, SHFLHANDLE hFile, +DECLVBGL(int) VbglR0SfWrite(PVBGLSFCLIENT pClient, PVBGLSFMAP pMap, SHFLHANDLE hFile, uint64_t offset, uint32_t *pcbBuffer, uint8_t *pBuffer, bool fLocked) { @@ -445,5 +445,5 @@ } -DECLVBGL(int) VbglR0SfWritePhysCont(PVBSFCLIENT pClient, PVBSFMAP pMap, SHFLHANDLE hFile, uint64_t offset, +DECLVBGL(int) VbglR0SfWritePhysCont(PVBGLSFCLIENT pClient, PVBGLSFMAP pMap, SHFLHANDLE hFile, uint64_t offset, uint32_t *pcbBuffer, RTCCPHYS PhysBuffer) { @@ -494,5 +494,5 @@ } -DECLVBGL(int) VbglR0SfWritePageList(PVBSFCLIENT pClient, PVBSFMAP pMap, SHFLHANDLE hFile, uint64_t offset, uint32_t *pcbBuffer, +DECLVBGL(int) VbglR0SfWritePageList(PVBGLSFCLIENT pClient, PVBGLSFMAP pMap, SHFLHANDLE hFile, uint64_t offset, uint32_t *pcbBuffer, uint16_t offFirstPage, uint16_t cPages, RTGCPHYS64 *paPages) { @@ -540,5 +540,5 @@ } -DECLVBGL(int) VbglR0SfFlush(PVBSFCLIENT pClient, PVBSFMAP pMap, SHFLHANDLE hFile) +DECLVBGL(int) VbglR0SfFlush(PVBGLSFCLIENT pClient, PVBGLSFMAP pMap, SHFLHANDLE hFile) { int rc; @@ -561,6 +561,6 @@ DECLVBGL(int) VbglR0SfDirInfo( - PVBSFCLIENT pClient, - PVBSFMAP pMap, + PVBGLSFCLIENT pClient, + PVBGLSFMAP pMap, SHFLHANDLE hFile, PSHFLSTRING ParsedPath, @@ -607,5 +607,5 @@ } -DECLVBGL(int) VbglR0SfFsInfo(PVBSFCLIENT pClient, PVBSFMAP pMap, SHFLHANDLE hFile, +DECLVBGL(int) VbglR0SfFsInfo(PVBGLSFCLIENT pClient, PVBGLSFMAP pMap, SHFLHANDLE hFile, uint32_t flags, uint32_t *pcbBuffer, PSHFLDIRINFO pBuffer) { @@ -638,5 +638,5 @@ } -DECLVBGL(int) VbglR0SfLock(PVBSFCLIENT pClient, PVBSFMAP pMap, SHFLHANDLE hFile, +DECLVBGL(int) VbglR0SfLock(PVBGLSFCLIENT pClient, PVBGLSFMAP pMap, SHFLHANDLE hFile, uint64_t offset, uint64_t cbSize, uint32_t fLock) { @@ -666,5 +666,5 @@ } -DECLVBGL(int) VbglR0SfSetUtf8(PVBSFCLIENT pClient) +DECLVBGL(int) VbglR0SfSetUtf8(PVBGLSFCLIENT pClient) { int rc; @@ -679,5 +679,5 @@ } -DECLVBGL(int) VbglR0SfReadLink(PVBSFCLIENT pClient, PVBSFMAP pMap, PSHFLSTRING pParsedPath, uint32_t cbBuffer, uint8_t *pBuffer) +DECLVBGL(int) VbglR0SfReadLink(PVBGLSFCLIENT pClient, PVBGLSFMAP pMap, PSHFLSTRING pParsedPath, uint32_t cbBuffer, uint8_t *pBuffer) { int rc; @@ -704,5 +704,5 @@ } -DECLVBGL(int) VbglR0SfSymlink(PVBSFCLIENT pClient, PVBSFMAP pMap, PSHFLSTRING pNewPath, PSHFLSTRING pOldPath, +DECLVBGL(int) VbglR0SfSymlink(PVBGLSFCLIENT pClient, PVBGLSFMAP pMap, PSHFLSTRING pNewPath, PSHFLSTRING pOldPath, PSHFLFSOBJINFO pBuffer) { @@ -734,5 +734,5 @@ } -DECLVBGL(int) VbglR0SfSetSymlinks(PVBSFCLIENT pClient) +DECLVBGL(int) VbglR0SfSetSymlinks(PVBGLSFCLIENT pClient) { int rc; Index: /trunk/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR0LibSharedFolders.h =================================================================== --- /trunk/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR0LibSharedFolders.h (revision 58195) +++ /trunk/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR0LibSharedFolders.h (revision 58196) @@ -63,19 +63,18 @@ #include -#define ASSERTVBSF AssertRelease #include -typedef struct _VBSFCLIENT +typedef struct VBGLSFCLIENT { uint32_t ulClientID; VBGLHGCMHANDLE handle; -} VBSFCLIENT; -typedef VBSFCLIENT *PVBSFCLIENT; +} VBGLSFCLIENT; +typedef VBGLSFCLIENT *PVBGLSFCLIENT; -typedef struct _VBSFMAP +typedef struct VBGLSFMAP { SHFLROOT root; -} VBSFMAP, *PVBSFMAP; +} VBGLSFMAP, *PVBGLSFMAP; @@ -131,10 +130,10 @@ DECLVBGL(int) VbglR0SfInit(void); DECLVBGL(void) VbglR0SfTerm(void); -DECLVBGL(int) VbglR0SfConnect(PVBSFCLIENT pClient); -DECLVBGL(void) VbglR0SfDisconnect(PVBSFCLIENT pClient); +DECLVBGL(int) VbglR0SfConnect(PVBGLSFCLIENT pClient); +DECLVBGL(void) VbglR0SfDisconnect(PVBGLSFCLIENT pClient); -DECLVBGL(int) VbglR0SfQueryMappings(PVBSFCLIENT pClient, SHFLMAPPING paMappings[], uint32_t *pcMappings); +DECLVBGL(int) VbglR0SfQueryMappings(PVBGLSFCLIENT pClient, SHFLMAPPING paMappings[], uint32_t *pcMappings); -DECLVBGL(int) VbglR0SfQueryMapName(PVBSFCLIENT pClient, SHFLROOT root, SHFLSTRING *pString, uint32_t size); +DECLVBGL(int) VbglR0SfQueryMapName(PVBGLSFCLIENT pClient, SHFLROOT root, SHFLSTRING *pString, uint32_t size); /** @@ -161,34 +160,34 @@ * as additional information. */ -DECLVBGL(int) VbglR0SfCreate(PVBSFCLIENT pClient, PVBSFMAP pMap, PSHFLSTRING pParsedPath, PSHFLCREATEPARMS pCreateParms); +DECLVBGL(int) VbglR0SfCreate(PVBGLSFCLIENT pClient, PVBGLSFMAP pMap, PSHFLSTRING pParsedPath, PSHFLCREATEPARMS pCreateParms); -DECLVBGL(int) VbglR0SfClose(PVBSFCLIENT pClient, PVBSFMAP pMap, SHFLHANDLE Handle); -DECLVBGL(int) VbglR0SfRemove(PVBSFCLIENT pClient, PVBSFMAP pMap, PSHFLSTRING pParsedPath, uint32_t flags); -DECLVBGL(int) VbglR0SfRename(PVBSFCLIENT pClient, PVBSFMAP pMap, PSHFLSTRING pSrcPath, PSHFLSTRING pDestPath, uint32_t flags); -DECLVBGL(int) VbglR0SfFlush(PVBSFCLIENT pClient, PVBSFMAP pMap, SHFLHANDLE hFile); +DECLVBGL(int) VbglR0SfClose(PVBGLSFCLIENT pClient, PVBGLSFMAP pMap, SHFLHANDLE Handle); +DECLVBGL(int) VbglR0SfRemove(PVBGLSFCLIENT pClient, PVBGLSFMAP pMap, PSHFLSTRING pParsedPath, uint32_t flags); +DECLVBGL(int) VbglR0SfRename(PVBGLSFCLIENT pClient, PVBGLSFMAP pMap, PSHFLSTRING pSrcPath, PSHFLSTRING pDestPath, uint32_t flags); +DECLVBGL(int) VbglR0SfFlush(PVBGLSFCLIENT pClient, PVBGLSFMAP pMap, SHFLHANDLE hFile); -DECLVBGL(int) VbglR0SfRead(PVBSFCLIENT pClient, PVBSFMAP pMap, SHFLHANDLE hFile, uint64_t offset, uint32_t *pcbBuffer, uint8_t *pBuffer, bool fLocked); -DECLVBGL(int) VbglR0SfReadPageList(PVBSFCLIENT pClient, PVBSFMAP pMap, SHFLHANDLE hFile, uint64_t offset, uint32_t *pcbBuffer, +DECLVBGL(int) VbglR0SfRead(PVBGLSFCLIENT pClient, PVBGLSFMAP pMap, SHFLHANDLE hFile, uint64_t offset, uint32_t *pcbBuffer, uint8_t *pBuffer, bool fLocked); +DECLVBGL(int) VbglR0SfReadPageList(PVBGLSFCLIENT pClient, PVBGLSFMAP pMap, SHFLHANDLE hFile, uint64_t offset, uint32_t *pcbBuffer, uint16_t offFirstPage, uint16_t cPages, RTGCPHYS64 *paPages); -DECLVBGL(int) VbglR0SfWrite(PVBSFCLIENT pClient, PVBSFMAP pMap, SHFLHANDLE hFile, uint64_t offset, +DECLVBGL(int) VbglR0SfWrite(PVBGLSFCLIENT pClient, PVBGLSFMAP pMap, SHFLHANDLE hFile, uint64_t offset, uint32_t *pcbBuffer, uint8_t *pBuffer, bool fLocked); -DECLVBGL(int) VbglR0SfWritePhysCont(PVBSFCLIENT pClient, PVBSFMAP pMap, SHFLHANDLE hFile, uint64_t offset, +DECLVBGL(int) VbglR0SfWritePhysCont(PVBGLSFCLIENT pClient, PVBGLSFMAP pMap, SHFLHANDLE hFile, uint64_t offset, uint32_t *pcbBuffer, RTCCPHYS PhysBuffer); -DECLVBGL(int) VbglR0SfWritePageList(PVBSFCLIENT pClient, PVBSFMAP pMap, SHFLHANDLE hFile, uint64_t offset, uint32_t *pcbBuffer, +DECLVBGL(int) VbglR0SfWritePageList(PVBGLSFCLIENT pClient, PVBGLSFMAP pMap, SHFLHANDLE hFile, uint64_t offset, uint32_t *pcbBuffer, uint16_t offFirstPage, uint16_t cPages, RTGCPHYS64 *paPages); -DECLVBGL(int) VbglR0SfLock(PVBSFCLIENT pClient, PVBSFMAP pMap, SHFLHANDLE hFile, uint64_t offset, uint64_t cbSize, uint32_t fLock); +DECLVBGL(int) VbglR0SfLock(PVBGLSFCLIENT pClient, PVBGLSFMAP pMap, SHFLHANDLE hFile, uint64_t offset, uint64_t cbSize, uint32_t fLock); -DECLVBGL(int) VbglR0SfDirInfo(PVBSFCLIENT pClient, PVBSFMAP pMap, SHFLHANDLE hFile,PSHFLSTRING ParsedPath, uint32_t flags, +DECLVBGL(int) VbglR0SfDirInfo(PVBGLSFCLIENT pClient, PVBGLSFMAP pMap, SHFLHANDLE hFile,PSHFLSTRING ParsedPath, uint32_t flags, uint32_t index, uint32_t *pcbBuffer, PSHFLDIRINFO pBuffer, uint32_t *pcFiles); -DECLVBGL(int) VbglR0SfFsInfo(PVBSFCLIENT pClient, PVBSFMAP pMap, SHFLHANDLE hFile, uint32_t flags, uint32_t *pcbBuffer, PSHFLDIRINFO pBuffer); +DECLVBGL(int) VbglR0SfFsInfo(PVBGLSFCLIENT pClient, PVBGLSFMAP pMap, SHFLHANDLE hFile, uint32_t flags, uint32_t *pcbBuffer, PSHFLDIRINFO pBuffer); -DECLVBGL(int) VbglR0SfMapFolder(PVBSFCLIENT pClient, PSHFLSTRING szFolderName, PVBSFMAP pMap); -DECLVBGL(int) VbglR0SfUnmapFolder(PVBSFCLIENT pClient, PVBSFMAP pMap); -DECLVBGL(int) VbglR0SfSetUtf8(PVBSFCLIENT pClient); +DECLVBGL(int) VbglR0SfMapFolder(PVBGLSFCLIENT pClient, PSHFLSTRING szFolderName, PVBGLSFMAP pMap); +DECLVBGL(int) VbglR0SfUnmapFolder(PVBGLSFCLIENT pClient, PVBGLSFMAP pMap); +DECLVBGL(int) VbglR0SfSetUtf8(PVBGLSFCLIENT pClient); -DECLVBGL(int) VbglR0SfReadLink(PVBSFCLIENT pClient, PVBSFMAP pMap, PSHFLSTRING ParsedPath, uint32_t pcbBuffer, uint8_t *pBuffer); -DECLVBGL(int) VbglR0SfSymlink(PVBSFCLIENT pClient, PVBSFMAP pMap, PSHFLSTRING pNewPath, PSHFLSTRING pOldPath, PSHFLFSOBJINFO pBuffer); -DECLVBGL(int) VbglR0SfSetSymlinks(PVBSFCLIENT pClient); +DECLVBGL(int) VbglR0SfReadLink(PVBGLSFCLIENT pClient, PVBGLSFMAP pMap, PSHFLSTRING ParsedPath, uint32_t pcbBuffer, uint8_t *pBuffer); +DECLVBGL(int) VbglR0SfSymlink(PVBGLSFCLIENT pClient, PVBGLSFMAP pMap, PSHFLSTRING pNewPath, PSHFLSTRING pOldPath, PSHFLFSOBJINFO pBuffer); +DECLVBGL(int) VbglR0SfSetSymlinks(PVBGLSFCLIENT pClient); #endif /* !___VBoxGuestLib_VBoxGuestR0LibSharedFolders_h */ Index: /trunk/src/VBox/Additions/darwin/vboxfs/VBoxVFS.cpp =================================================================== --- /trunk/src/VBox/Additions/darwin/vboxfs/VBoxVFS.cpp (revision 58195) +++ /trunk/src/VBox/Additions/darwin/vboxfs/VBoxVFS.cpp (revision 58196) @@ -91,5 +91,5 @@ static bool volatile g_fInstantiated = 0; /* Global connection to the host service */ -VBSFCLIENT g_vboxSFClient; +VBGLSFCLIENT g_vboxSFClient; /* VBoxVFS filesystem handle. Needed for FS unregistering. */ static vfstable_t g_oVBoxVFSHandle; Index: /trunk/src/VBox/Additions/darwin/vboxfs/vboxvfs.h =================================================================== --- /trunk/src/VBox/Additions/darwin/vboxfs/vboxvfs.h (revision 58195) +++ /trunk/src/VBox/Additions/darwin/vboxfs/vboxvfs.h (revision 58196) @@ -59,5 +59,5 @@ /** Global refernce to host service connection */ -extern VBSFCLIENT g_vboxSFClient; +extern VBGLSFCLIENT g_vboxSFClient; /** Private data assigned to each mounted shared folder. Assigned to mp structure. */ Index: /trunk/src/VBox/Additions/freebsd/vboxvfs/vboxvfs.h =================================================================== --- /trunk/src/VBox/Additions/freebsd/vboxvfs/vboxvfs.h (revision 58195) +++ /trunk/src/VBox/Additions/freebsd/vboxvfs/vboxvfs.h (revision 58196) @@ -54,5 +54,5 @@ /* structs - stolen from the linux shared module code */ struct sf_glob_info { - VBSFMAP map; + VBGLSFMAP map; /* struct nls_table *nls;*/ int ttl; Index: /trunk/src/VBox/Additions/freebsd/vboxvfs/vboxvfs_vfsops.c =================================================================== --- /trunk/src/VBox/Additions/freebsd/vboxvfs/vboxvfs_vfsops.c (revision 58195) +++ /trunk/src/VBox/Additions/freebsd/vboxvfs/vboxvfs_vfsops.c (revision 58196) @@ -40,5 +40,5 @@ /* global connection to the host service. */ -static VBSFCLIENT g_vboxSFClient; +static VBGLSFCLIENT g_vboxSFClient; static vfs_init_t vboxvfs_init; Index: /trunk/src/VBox/Additions/haiku/SharedFolders/vboxsf.c =================================================================== --- /trunk/src/VBox/Additions/haiku/SharedFolders/vboxsf.c (revision 58195) +++ /trunk/src/VBox/Additions/haiku/SharedFolders/vboxsf.c (revision 58196) @@ -50,5 +50,5 @@ #define FS_PRETTY_NAME "VirtualBox Shared Folders" -VBSFCLIENT g_clientHandle; +VBGLSFCLIENT g_clientHandle; static fs_volume_ops vboxsf_volume_ops; static fs_vnode_ops vboxsf_vnode_ops; Index: /trunk/src/VBox/Additions/haiku/SharedFolders/vboxsf.h =================================================================== --- /trunk/src/VBox/Additions/haiku/SharedFolders/vboxsf.h (revision 58195) +++ /trunk/src/VBox/Additions/haiku/SharedFolders/vboxsf.h (revision 58196) @@ -59,5 +59,5 @@ typedef struct vboxsf_volume { - VBSFMAP map; + VBGLSFMAP map; ino_t rootid; } vboxsf_volume; @@ -65,5 +65,5 @@ typedef struct vboxsf_vnode { - PVBSFMAP map; + PVBGLSFMAP map; PSHFLSTRING name; PSHFLSTRING path; @@ -92,5 +92,5 @@ #endif -status_t vboxsf_new_vnode(PVBSFMAP map, PSHFLSTRING path, PSHFLSTRING name, vboxsf_vnode** p); +status_t vboxsf_new_vnode(PVBGLSFMAP map, PSHFLSTRING path, PSHFLSTRING name, vboxsf_vnode** p); status_t vboxsf_get_vnode(fs_volume* volume, ino_t id, fs_vnode* vnode, int* _type, uint32* _flags, bool reenter); status_t vboxsf_put_vnode(fs_volume* volume, fs_vnode* vnode, bool reenter); Index: /trunk/src/VBox/Additions/linux/sharedfolders/vfsmod.c =================================================================== --- /trunk/src/VBox/Additions/linux/sharedfolders/vfsmod.c (revision 58195) +++ /trunk/src/VBox/Additions/linux/sharedfolders/vfsmod.c (revision 58196) @@ -39,5 +39,5 @@ /* globals */ -VBSFCLIENT client_handle; +VBGLSFCLIENT client_handle; /* forward declarations */ Index: /trunk/src/VBox/Additions/linux/sharedfolders/vfsmod.h =================================================================== --- /trunk/src/VBox/Additions/linux/sharedfolders/vfsmod.h (revision 58195) +++ /trunk/src/VBox/Additions/linux/sharedfolders/vfsmod.h (revision 58196) @@ -36,5 +36,5 @@ struct sf_glob_info { - VBSFMAP map; + VBGLSFMAP map; struct nls_table *nls; int ttl; @@ -86,5 +86,5 @@ /* globals */ -extern VBSFCLIENT client_handle; +extern VBGLSFCLIENT client_handle; /* forward declarations */ Index: /trunk/src/VBox/Additions/solaris/SharedFolders/vboxfs.h =================================================================== --- /trunk/src/VBox/Additions/solaris/SharedFolders/vboxfs.h (revision 58195) +++ /trunk/src/VBox/Additions/solaris/SharedFolders/vboxfs.h (revision 58196) @@ -58,5 +58,5 @@ typedef struct vboxvfs_globinfo { - VBSFMAP Map; + VBGLSFMAP Map; int Ttl; int Uid; @@ -69,5 +69,5 @@ extern struct vnodeops *g_pVBoxVFS_vnodeops; extern const fs_operation_def_t g_VBoxVFS_vnodeops_template[]; -extern VBSFCLIENT g_VBoxVFSClient; +extern VBGLSFCLIENT g_VBoxVFSClient; /** Helper functions */ Index: /trunk/src/VBox/Additions/solaris/SharedFolders/vboxfs_prov.c =================================================================== --- /trunk/src/VBox/Additions/solaris/SharedFolders/vboxfs_prov.c (revision 58195) +++ /trunk/src/VBox/Additions/solaris/SharedFolders/vboxfs_prov.c (revision 58196) @@ -50,5 +50,5 @@ #define SFPROV_VERSION 1 -static VBSFCLIENT vbox_client; +static VBGLSFCLIENT vbox_client; static int sfprov_vbox2errno(int rc) @@ -312,5 +312,5 @@ struct sfp_file { SHFLHANDLE handle; - VBSFMAP map; /* need this again for the close operation */ + VBGLSFMAP map; /**< need this again for the close operation */ }; Index: /trunk/src/VBox/Additions/solaris/SharedFolders/vboxfs_prov.h =================================================================== --- /trunk/src/VBox/Additions/solaris/SharedFolders/vboxfs_prov.h (revision 58195) +++ /trunk/src/VBox/Additions/solaris/SharedFolders/vboxfs_prov.h (revision 58196) @@ -70,11 +70,11 @@ */ typedef struct spf_mount_t { - VBSFMAP map; /* guest<->host mapping */ - uid_t sf_uid; /* owner of the mount point */ - gid_t sf_gid; /* group of the mount point */ - mode_t sf_dmode; /* mode of all directories if != ~0U */ - mode_t sf_fmode; /* mode of all files if != ~0U */ - mode_t sf_dmask; /* mask of all directories */ - mode_t sf_fmask; /* mask of all files */ + VBGLSFMAP map; /**< guest<->host mapping */ + uid_t sf_uid; /**< owner of the mount point */ + gid_t sf_gid; /**< group of the mount point */ + mode_t sf_dmode; /**< mode of all directories if != ~0U */ + mode_t sf_fmode; /**< mode of all files if != ~0U */ + mode_t sf_dmask; /**< mask of all directories */ + mode_t sf_fmask; /**< mask of all files */ } sfp_mount_t;