Index: /trunk/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR0LibSharedFolders.c
===================================================================
--- /trunk/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR0LibSharedFolders.c	(revision 58191)
+++ /trunk/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR0LibSharedFolders.c	(revision 58192)
@@ -51,28 +51,24 @@
 #define SHFL_CPARMS_SET_SYMLINKS 0
 
-#define VBOX_INIT_CALL(a, b, c)          \
-    LogFunc(("%s, u32ClientID=%d\n", "SHFL_FN_" # b, \
-            (c)->ulClientID)); \
-    (a)->result      = VINF_SUCCESS;     \
-    (a)->u32ClientID = (c)->ulClientID;  \
-    (a)->u32Function = SHFL_FN_##b;      \
+#define VBOX_INIT_CALL(a, b, c) \
+    LogFunc(("%s, u32ClientID=%d\n", "SHFL_FN_" # b, (c)->ulClientID)); \
+    (a)->result      = VINF_SUCCESS; \
+    (a)->u32ClientID = (c)->ulClientID; \
+    (a)->u32Function = SHFL_FN_##b; \
     (a)->cParms      = SHFL_CPARMS_##b
 
 
 
-DECLVBGL(int) vboxInit (void)
-{
-    int rc = VINF_SUCCESS;
-
-    rc = VbglInitClient();
-    return rc;
-}
-
-DECLVBGL(void) vboxUninit (void)
-{
-    VbglTerminate ();
-}
-
-DECLVBGL(int) vboxConnect (PVBSFCLIENT pClient)
+DECLVBGL(int) vboxInit(void)
+{
+    return VbglInitClient();
+}
+
+DECLVBGL(void) vboxUninit(void)
+{
+    VbglTerminate();
+}
+
+DECLVBGL(int) vboxConnect(PVBSFCLIENT pClient)
 {
     int rc;
@@ -86,15 +82,10 @@
     strcpy (data.Loc.u.host.achName, "VBoxSharedFolders");
 
-    rc = VbglHGCMConnect (&pClient->handle, &data);
-
+    rc = VbglHGCMConnect(&pClient->handle, &data);
 /*    Log(("VBOXSF: VBoxSF::vboxConnect: VbglHGCMConnect rc = %#x, result = %#x\n",
-         rc, data.result));
-*/
-    if (RT_SUCCESS (rc))
-    {
+         rc, data.result)); */
+    if (RT_SUCCESS(rc))
         rc = data.result;
-    }
-
-    if (RT_SUCCESS (rc))
+    if (RT_SUCCESS(rc))
     {
         pClient->ulClientID = data.u32ClientID;
@@ -104,5 +95,5 @@
 }
 
-DECLVBGL(void) vboxDisconnect (PVBSFCLIENT pClient)
+DECLVBGL(void) vboxDisconnect(PVBSFCLIENT pClient)
 {
     int rc;
@@ -117,17 +108,14 @@
     data.u32ClientID = pClient->ulClientID;
 
-    rc = VbglHGCMDisconnect (pClient->handle, &data);
+    rc = VbglHGCMDisconnect(pClient->handle, &data);
     NOREF(rc);
 /*    Log(("VBOXSF: VBoxSF::vboxDisconnect: "
-         "VbglHGCMDisconnect rc = %#x, result = %#x\n", rc, data.result));
-*/
+         "VbglHGCMDisconnect rc = %#x, result = %#x\n", rc, data.result)); */
     return;
 }
 
-DECLVBGL(int) vboxCallQueryMappings (PVBSFCLIENT pClient, SHFLMAPPING paMappings[],
-                                     uint32_t *pcMappings)
-{
-    int rc = VINF_SUCCESS;
-
+DECLVBGL(int) vboxCallQueryMappings(PVBSFCLIENT pClient, SHFLMAPPING paMappings[], uint32_t *pcMappings)
+{
+    int rc;
     VBoxSFQueryMappings data;
 
@@ -141,33 +129,23 @@
 
     data.mappings.type                   = VMMDevHGCMParmType_LinAddr;
-    data.mappings.u.Pointer.size         = sizeof (SHFLMAPPING) * *pcMappings;
+    data.mappings.u.Pointer.size         = sizeof(SHFLMAPPING) * *pcMappings;
     data.mappings.u.Pointer.u.linearAddr = (uintptr_t)&paMappings[0];
 
 /*    Log(("VBOXSF: in ifs difference %d\n",
-         (char *)&data.flags.type - (char *)&data.callInfo.cParms));
-*/
-    rc = VbglHGCMCall (pClient->handle, &data.callInfo, sizeof (data));
-
-/*
-    Log(("VBOXSF: VBoxSF::vboxCallQueryMappings: "
-         "VbglHGCMCall rc = %#x, result = %#x\n", rc, data.callInfo.result));
-*/
-    if (RT_SUCCESS (rc))
-    {
-        rc = data.callInfo.result;
-    }
-
-    if (RT_SUCCESS (rc))
-    {
+         (char *)&data.flags.type - (char *)&data.callInfo.cParms)); */
+    rc = VbglHGCMCall(pClient->handle, &data.callInfo, sizeof(data));
+/*    Log(("VBOXSF: VBoxSF::vboxCallQueryMappings: "
+         "VbglHGCMCall rc = %#x, result = %#x\n", rc, data.callInfo.result)); */
+    if (RT_SUCCESS(rc))
+        rc = data.callInfo.result;
+    if (RT_SUCCESS(rc))
         *pcMappings = data.numberOfMappings.u.value32;
-    }
-
-    return rc;
-}
-
-DECLVBGL(int) vboxCallQueryMapName (PVBSFCLIENT pClient, SHFLROOT root, SHFLSTRING *pString, uint32_t size)
-{
-    int rc = VINF_SUCCESS;
-
+
+    return rc;
+}
+
+DECLVBGL(int) vboxCallQueryMapName(PVBSFCLIENT pClient, SHFLROOT root, SHFLSTRING *pString, uint32_t size)
+{
+    int rc;
     VBoxSFQueryMapName data;
 
@@ -181,22 +159,16 @@
     data.name.u.Pointer.u.linearAddr = (uintptr_t)pString;
 
-    rc = VbglHGCMCall (pClient->handle, &data.callInfo, sizeof (data));
-
+    rc = VbglHGCMCall(pClient->handle, &data.callInfo, sizeof(data));
 /*    Log(("VBOXSF: VBoxSF::vboxCallQueryMapName: "
-         "VbglHGCMCall rc = %#x, result = %#x\n", rc, data.callInfo.result));
-*/
-    if (RT_SUCCESS (rc))
-    {
-        rc = data.callInfo.result;
-    }
-
-    return rc;
-}
-
-DECLVBGL(int) vboxCallMapFolder(PVBSFCLIENT pClient, PSHFLSTRING szFolderName,
-                                PVBSFMAP pMap)
-{
-    int rc = VINF_SUCCESS;
-
+         "VbglHGCMCall rc = %#x, result = %#x\n", rc, data.callInfo.result)); */
+    if (RT_SUCCESS(rc))
+        rc = data.callInfo.result;
+
+    return rc;
+}
+
+DECLVBGL(int) vboxCallMapFolder(PVBSFCLIENT pClient, PSHFLSTRING szFolderName, PVBSFMAP pMap)
+{
+    int rc;
     VBoxSFMapFolder data;
 
@@ -204,5 +176,5 @@
 
     data.path.type                    = VMMDevHGCMParmType_LinAddr;
-    data.path.u.Pointer.size          = ShflStringSizeOfBuffer (szFolderName);
+    data.path.u.Pointer.size          = ShflStringSizeOfBuffer(szFolderName);
     data.path.u.Pointer.u.linearAddr  = (uintptr_t)szFolderName;
 
@@ -220,10 +192,8 @@
 #endif
 
-    rc = VbglHGCMCall (pClient->handle, &data.callInfo, sizeof (data));
-
+    rc = VbglHGCMCall(pClient->handle, &data.callInfo, sizeof(data));
 /*    Log(("VBOXSF: VBoxSF::vboxCallMapFolder: "
-         "VbglHGCMCall rc = %#x, result = %#x\n", rc, data.callInfo.result));
-*/
-    if (RT_SUCCESS (rc))
+         "VbglHGCMCall rc = %#x, result = %#x\n", rc, data.callInfo.result)); */
+    if (RT_SUCCESS(rc))
     {
         pMap->root = data.root.u.value32;
@@ -247,7 +217,6 @@
         OldData.delimiter.u.value32          = RTPATH_DELIMITER;
 
-        rc = VbglHGCMCall (pClient->handle, &OldData.callInfo, sizeof (OldData));
-
-        if (RT_SUCCESS (rc))
+        rc = VbglHGCMCall(pClient->handle, &OldData.callInfo, sizeof(OldData));
+        if (RT_SUCCESS(rc))
         {
             pMap->root = OldData.root.u.value32;
@@ -260,6 +229,5 @@
 DECLVBGL(int) vboxCallUnmapFolder(PVBSFCLIENT pClient, PVBSFMAP pMap)
 {
-    int rc = VINF_SUCCESS;
-
+    int rc;
     VBoxSFUnmapFolder data;
 
@@ -269,22 +237,16 @@
     data.root.u.value32                 = pMap->root;
 
-    rc = VbglHGCMCall (pClient->handle, &data.callInfo, sizeof (data));
-
+    rc = VbglHGCMCall(pClient->handle, &data.callInfo, sizeof(data));
 /*    Log(("VBOXSF: VBoxSF::vboxCallUnmapFolder: "
-         "VbglHGCMCall rc = %#x, result = %#x\n", rc, data.callInfo.result));
-*/
-    if (RT_SUCCESS (rc))
-    {
-        rc         = data.callInfo.result;
-    }
-    return rc;
-}
-
-DECLVBGL(int) vboxCallCreate (PVBSFCLIENT pClient, PVBSFMAP pMap,
-                              PSHFLSTRING pParsedPath, PSHFLCREATEPARMS pCreateParms)
+         "VbglHGCMCall rc = %#x, result = %#x\n", rc, data.callInfo.result)); */
+    if (RT_SUCCESS(rc))
+        rc = data.callInfo.result;
+    return rc;
+}
+
+DECLVBGL(int) vboxCallCreate(PVBSFCLIENT pClient, PVBSFMAP pMap, PSHFLSTRING pParsedPath, PSHFLCREATEPARMS pCreateParms)
 {
     /** @todo copy buffers to physical or mapped memory. */
-    int rc = VINF_SUCCESS;
-
+    int rc;
     VBoxSFCreate data;
 
@@ -299,23 +261,18 @@
 
     data.parms.type                   = VMMDevHGCMParmType_LinAddr;
-    data.parms.u.Pointer.size         = sizeof (SHFLCREATEPARMS);
+    data.parms.u.Pointer.size         = sizeof(SHFLCREATEPARMS);
     data.parms.u.Pointer.u.linearAddr = (uintptr_t)pCreateParms;
 
-    rc = VbglHGCMCall (pClient->handle, &data.callInfo, sizeof (data));
-
+    rc = VbglHGCMCall(pClient->handle, &data.callInfo, sizeof(data));
 /*    Log(("VBOXSF: VBoxSF::vboxCallCreate: "
-         "VbglHGCMCall rc = %#x, result = %#x\n", rc, data.callInfo.result));
-*/
-    if (RT_SUCCESS (rc))
-    {
-        rc = data.callInfo.result;
-    }
-    return rc;
-}
-
-DECLVBGL(int) vboxCallClose (PVBSFCLIENT pClient, PVBSFMAP pMap, SHFLHANDLE Handle)
-{
-    int rc = VINF_SUCCESS;
-
+         "VbglHGCMCall rc = %#x, result = %#x\n", rc, data.callInfo.result)); */
+    if (RT_SUCCESS(rc))
+        rc = data.callInfo.result;
+    return rc;
+}
+
+DECLVBGL(int) vboxCallClose(PVBSFCLIENT pClient, PVBSFMAP pMap, SHFLHANDLE Handle)
+{
+    int rc;
     VBoxSFClose data;
 
@@ -328,14 +285,9 @@
     data.handle.u.value64               = Handle;
 
-    rc = VbglHGCMCall (pClient->handle, &data.callInfo, sizeof (data));
-
+    rc = VbglHGCMCall(pClient->handle, &data.callInfo, sizeof(data));
 /*    Log(("VBOXSF: VBoxSF::vboxCallClose: "
-         "VbglHGCMCall rc = %#x, result = %#x\n", rc, data.callInfo.result));
-*/
-    if (RT_SUCCESS (rc))
-    {
-        rc = data.callInfo.result;
-    }
-
+         "VbglHGCMCall rc = %#x, result = %#x\n", rc, data.callInfo.result)); */
+    if (RT_SUCCESS(rc))
+        rc = data.callInfo.result;
     return rc;
 }
@@ -354,5 +306,5 @@
 
     data.path.type                      = VMMDevHGCMParmType_LinAddr_In;
-    data.path.u.Pointer.size            = ShflStringSizeOfBuffer (pParsedPath);
+    data.path.u.Pointer.size            = ShflStringSizeOfBuffer(pParsedPath);
     data.path.u.Pointer.u.linearAddr    = (uintptr_t)pParsedPath;
 
@@ -360,22 +312,15 @@
     data.flags.u.value32                = flags;
 
-    rc = VbglHGCMCall (pClient->handle, &data.callInfo, sizeof (data));
-
+    rc = VbglHGCMCall(pClient->handle, &data.callInfo, sizeof(data));
 /*    Log(("VBOXSF: VBoxSF::vboxCallRemove: "
-         "VbglHGCMCall rc = %#x, result = %#x\n", rc, data.callInfo.result));
-*/
+         "VbglHGCMCall rc = %#x, result = %#x\n", rc, data.callInfo.result)); */
     if (RT_SUCCESS (rc))
-    {
-        rc = data.callInfo.result;
-    }
-
-    return rc;
-}
-
-DECLVBGL(int) vboxCallRename (PVBSFCLIENT pClient, PVBSFMAP pMap,
-                              PSHFLSTRING pSrcPath, PSHFLSTRING pDestPath, uint32_t flags)
-{
-    int rc = VINF_SUCCESS;
-
+        rc = data.callInfo.result;
+    return rc;
+}
+
+DECLVBGL(int) vboxCallRename(PVBSFCLIENT pClient, PVBSFMAP pMap, PSHFLSTRING pSrcPath, PSHFLSTRING pDestPath, uint32_t flags)
+{
+    int rc;
     VBoxSFRename data;
 
@@ -386,9 +331,9 @@
 
     data.src.type                       = VMMDevHGCMParmType_LinAddr_In;
-    data.src.u.Pointer.size             = ShflStringSizeOfBuffer (pSrcPath);
+    data.src.u.Pointer.size             = ShflStringSizeOfBuffer(pSrcPath);
     data.src.u.Pointer.u.linearAddr     = (uintptr_t)pSrcPath;
 
     data.dest.type                      = VMMDevHGCMParmType_LinAddr_In;
-    data.dest.u.Pointer.size            = ShflStringSizeOfBuffer (pDestPath);
+    data.dest.u.Pointer.size            = ShflStringSizeOfBuffer(pDestPath);
     data.dest.u.Pointer.u.linearAddr    = (uintptr_t)pDestPath;
 
@@ -396,13 +341,9 @@
     data.flags.u.value32                = flags;
 
-    rc = VbglHGCMCall (pClient->handle, &data.callInfo, sizeof (data));
-
+    rc = VbglHGCMCall(pClient->handle, &data.callInfo, sizeof(data));
 /*    Log(("VBOXSF: VBoxSF::vboxCallRename: "
-         "VbglHGCMCall rc = %#x, result = %#x\n", rc, data.callInfo.result));
-*/
+         "VbglHGCMCall rc = %#x, result = %#x\n", rc, data.callInfo.result)); */
     if (RT_SUCCESS (rc))
-    {
-        rc = data.callInfo.result;
-    }
+        rc = data.callInfo.result;
     return rc;
 }
@@ -411,6 +352,5 @@
                            uint64_t offset, uint32_t *pcbBuffer, uint8_t *pBuffer, bool fLocked)
 {
-    int rc = VINF_SUCCESS;
-
+    int rc;
     VBoxSFRead data;
 
@@ -430,10 +370,8 @@
     data.buffer.u.Pointer.u.linearAddr  = (uintptr_t)pBuffer;
 
-    rc = VbglHGCMCall (pClient->handle, &data.callInfo, sizeof (data));
-
+    rc = VbglHGCMCall(pClient->handle, &data.callInfo, sizeof(data));
 /*    Log(("VBOXSF: VBoxSF::vboxCallRead: "
-         "VbglHGCMCall rc = %#x, result = %#x\n", rc, data.callInfo.result));
-*/
-    if (RT_SUCCESS (rc))
+         "VbglHGCMCall rc = %#x, result = %#x\n", rc, data.callInfo.result)); */
+    if (RT_SUCCESS(rc))
     {
         rc = data.callInfo.result;
@@ -492,6 +430,5 @@
                             uint64_t offset, uint32_t *pcbBuffer, uint8_t *pBuffer, bool fLocked)
 {
-    int rc = VINF_SUCCESS;
-
+    int rc;
     VBoxSFWrite data;
 
@@ -507,14 +444,12 @@
     data.cb.type                        = VMMDevHGCMParmType_32bit;
     data.cb.u.value32                   = *pcbBuffer;
-    data.buffer.type                    = (fLocked) ? VMMDevHGCMParmType_LinAddr_Locked_In : VMMDevHGCMParmType_LinAddr_In;
+    data.buffer.type                    = fLocked ? VMMDevHGCMParmType_LinAddr_Locked_In : VMMDevHGCMParmType_LinAddr_In;
     data.buffer.u.Pointer.size          = *pcbBuffer;
     data.buffer.u.Pointer.u.linearAddr  = (uintptr_t)pBuffer;
 
-    rc = VbglHGCMCall (pClient->handle, &data.callInfo, sizeof (data));
-
+    rc = VbglHGCMCall(pClient->handle, &data.callInfo, sizeof(data));
 /*    Log(("VBOXSF: VBoxSF::vboxCallWrite: "
-         "VbglHGCMCall rc = %#x, result = %#x\n", rc, data.callInfo.result));
-*/
-    if (RT_SUCCESS (rc))
+         "VbglHGCMCall rc = %#x, result = %#x\n", rc, data.callInfo.result)); */
+    if (RT_SUCCESS(rc))
     {
         rc = data.callInfo.result;
@@ -559,6 +494,6 @@
         pPgLst->aPages[iPage] = PhysBuffer;
 
-    rc = VbglHGCMCall (pClient->handle, &pData->callInfo, cbData);
-    if (RT_SUCCESS (rc))
+    rc = VbglHGCMCall(pClient->handle, &pData->callInfo, cbData);
+    if (RT_SUCCESS(rc))
     {
         rc = pData->callInfo.result;
@@ -606,6 +541,6 @@
         pPgLst->aPages[iPage] = paPages[iPage];
 
-    rc = VbglHGCMCall (pClient->handle, &pData->callInfo, cbData);
-    if (RT_SUCCESS (rc))
+    rc = VbglHGCMCall(pClient->handle, &pData->callInfo, cbData);
+    if (RT_SUCCESS(rc))
     {
         rc = pData->callInfo.result;
@@ -619,6 +554,5 @@
 DECLVBGL(int) vboxCallFlush(PVBSFCLIENT pClient, PVBSFMAP pMap, SHFLHANDLE hFile)
 {
-    int rc = VINF_SUCCESS;
-
+    int rc;
     VBoxSFFlush data;
 
@@ -631,17 +565,13 @@
     data.handle.u.value64               = hFile;
 
-    rc = VbglHGCMCall (pClient->handle, &data.callInfo, sizeof (data));
-
+    rc = VbglHGCMCall(pClient->handle, &data.callInfo, sizeof(data));
 /*    Log(("VBOXSF: VBoxSF::vboxCallFlush: "
-         "VbglHGCMCall rc = %#x, result = %#x\n", rc, data.callInfo.result));
-*/
-    if (RT_SUCCESS (rc))
-    {
-        rc = data.callInfo.result;
-    }
-    return rc;
-}
-
-DECLVBGL(int) vboxCallDirInfo (
+         "VbglHGCMCall rc = %#x, result = %#x\n", rc, data.callInfo.result)); */
+    if (RT_SUCCESS(rc))
+        rc = data.callInfo.result;
+    return rc;
+}
+
+DECLVBGL(int) vboxCallDirInfo(
     PVBSFCLIENT pClient,
     PVBSFMAP pMap,
@@ -654,6 +584,5 @@
     uint32_t *pcFiles)
 {
-    int rc = VINF_SUCCESS;
-
+    int rc;
     VBoxSFList data;
 
@@ -670,6 +599,5 @@
     data.cb.u.value32                   = *pcbBuffer;
     data.path.type                      = VMMDevHGCMParmType_LinAddr_In;
-    data.path.u.Pointer.size            =
-        (ParsedPath) ? ShflStringSizeOfBuffer(ParsedPath) : 0;
+    data.path.u.Pointer.size            = ParsedPath ? ShflStringSizeOfBuffer(ParsedPath) : 0;
     data.path.u.Pointer.u.linearAddr    = (uintptr_t) ParsedPath;
 
@@ -683,13 +611,9 @@
     data.cFiles.u.value32               = 0; /* out parameters only */
 
-    rc = VbglHGCMCall (pClient->handle, &data.callInfo, sizeof (data));
-
+    rc = VbglHGCMCall(pClient->handle, &data.callInfo, sizeof(data));
 /*    Log(("VBOXSF: VBoxSF::vboxCallDirInfo: "
-         "VbglHGCMCall rc = %#x, result = %#x\n", rc, data.callInfo.result));
-*/
-    if (RT_SUCCESS (rc))
-    {
-        rc = data.callInfo.result;
-    }
+         "VbglHGCMCall rc = %#x, result = %#x\n", rc, data.callInfo.result)); */
+    if (RT_SUCCESS(rc))
+        rc = data.callInfo.result;
     *pcbBuffer = data.cb.u.value32;
     *pcFiles   = data.cFiles.u.value32;
@@ -700,6 +624,5 @@
                              uint32_t flags, uint32_t *pcbBuffer, PSHFLDIRINFO pBuffer)
 {
-    int rc = VINF_SUCCESS;
-
+    int rc;
     VBoxSFInformation data;
 
@@ -719,10 +642,8 @@
     data.info.u.Pointer.u.linearAddr    = (uintptr_t)pBuffer;
 
-    rc = VbglHGCMCall (pClient->handle, &data.callInfo, sizeof (data));
-
+    rc = VbglHGCMCall(pClient->handle, &data.callInfo, sizeof(data));
 /*    Log(("VBOXSF: VBoxSF::vboxCallFileInfo: "
-         "VbglHGCMCall rc = %#x, result = %#x\n", rc, data.callInfo.result));
-*/
-    if (RT_SUCCESS (rc))
+         "VbglHGCMCall rc = %#x, result = %#x\n", rc, data.callInfo.result)); */
+    if (RT_SUCCESS(rc))
     {
         rc = data.callInfo.result;
@@ -735,6 +656,5 @@
                            uint64_t offset, uint64_t cbSize, uint32_t fLock)
 {
-    int rc = VINF_SUCCESS;
-
+    int rc;
     VBoxSFLock data;
 
@@ -754,36 +674,27 @@
     data.flags.u.value32                = fLock;
 
-    rc = VbglHGCMCall (pClient->handle, &data.callInfo, sizeof (data));
-
+    rc = VbglHGCMCall(pClient->handle, &data.callInfo, sizeof(data));
 /*    Log(("VBOXSF: VBoxSF::vboxCallLock: "
-         "VbglHGCMCall rc = %#x, result = %#x\n", rc, data.callInfo.result));
-*/
+         "VbglHGCMCall rc = %#x, result = %#x\n", rc, data.callInfo.result)); */
     if (RT_SUCCESS (rc))
-    {
-        rc = data.callInfo.result;
-    }
-    return rc;
-}
-
-DECLVBGL(int) vboxCallSetUtf8 (PVBSFCLIENT pClient)
-{
-    int rc = VINF_SUCCESS;
-
+        rc = data.callInfo.result;
+    return rc;
+}
+
+DECLVBGL(int) vboxCallSetUtf8(PVBSFCLIENT pClient)
+{
+    int rc;
     VBoxGuestHGCMCallInfo callInfo;
 
-    VBOX_INIT_CALL (&callInfo, SET_UTF8, pClient);
-    rc = VbglHGCMCall (pClient->handle, &callInfo, sizeof (callInfo));
-    if (RT_SUCCESS (rc))
-    {
+    VBOX_INIT_CALL(&callInfo, SET_UTF8, pClient);
+    rc = VbglHGCMCall(pClient->handle, &callInfo, sizeof(callInfo));
+    if (RT_SUCCESS(rc))
         rc = callInfo.result;
-    }
-    return rc;
-}
-
-DECLVBGL(int) vboxReadLink (PVBSFCLIENT pClient, PVBSFMAP pMap, PSHFLSTRING pParsedPath,
-                            uint32_t cbBuffer, uint8_t *pBuffer)
-{
-    int rc = VINF_SUCCESS;
-
+    return rc;
+}
+
+DECLVBGL(int) vboxReadLink(PVBSFCLIENT pClient, PVBSFMAP pMap, PSHFLSTRING pParsedPath, uint32_t cbBuffer, uint8_t *pBuffer)
+{
+    int rc;
     VBoxSFReadLink data;
 
@@ -801,21 +712,16 @@
     data.buffer.u.Pointer.u.linearAddr  = (uintptr_t)pBuffer;
 
-    rc = VbglHGCMCall (pClient->handle, &data.callInfo, sizeof (data));
-
+    rc = VbglHGCMCall(pClient->handle, &data.callInfo, sizeof(data));
 /*    Log(("VBOXSF: VBoxSF::vboxCallReadline: "
-         "VbglHGCMCall rc = %#x, result = %#x\n", rc, data.callInfo.result));
-*/
+         "VbglHGCMCall rc = %#x, result = %#x\n", rc, data.callInfo.result)); */
     if (RT_SUCCESS (rc))
-    {
-        rc = data.callInfo.result;
-    }
-    return rc;
-}
-
-DECLVBGL(int) vboxCallSymlink (PVBSFCLIENT pClient, PVBSFMAP pMap, PSHFLSTRING pNewPath, PSHFLSTRING pOldPath,
-                               PSHFLFSOBJINFO pBuffer)
-{
-    int rc = VINF_SUCCESS;
-
+        rc = data.callInfo.result;
+    return rc;
+}
+
+DECLVBGL(int) vboxCallSymlink(PVBSFCLIENT pClient, PVBSFMAP pMap, PSHFLSTRING pNewPath, PSHFLSTRING pOldPath,
+                              PSHFLFSOBJINFO pBuffer)
+{
+    int rc;
     VBoxSFSymlink data;
 
@@ -837,28 +743,21 @@
     data.info.u.Pointer.u.linearAddr    = (uintptr_t)pBuffer;
 
-    rc = VbglHGCMCall (pClient->handle, &data.callInfo, sizeof (data));
-
+    rc = VbglHGCMCall(pClient->handle, &data.callInfo, sizeof(data));
 /*    Log(("VBOXSF: VBoxSF::vboxCallSymlink: "
-         "VbglHGCMCall rc = %#x, result = %#x\n", rc, data.callInfo.result));
-*/
+         "VbglHGCMCall rc = %#x, result = %#x\n", rc, data.callInfo.result)); */
     if (RT_SUCCESS (rc))
-    {
-        rc = data.callInfo.result;
-    }
-    return rc;
-}
-
-DECLVBGL(int) vboxCallSetSymlinks (PVBSFCLIENT pClient)
-{
-    int rc = VINF_SUCCESS;
-
+        rc = data.callInfo.result;
+    return rc;
+}
+
+DECLVBGL(int) vboxCallSetSymlinks(PVBSFCLIENT pClient)
+{
+    int rc;
     VBoxGuestHGCMCallInfo callInfo;
 
-    VBOX_INIT_CALL (&callInfo, SET_SYMLINKS, pClient);
-    rc = VbglHGCMCall (pClient->handle, &callInfo, sizeof (callInfo));
-    if (RT_SUCCESS (rc))
-    {
+    VBOX_INIT_CALL(&callInfo, SET_SYMLINKS, pClient);
+    rc = VbglHGCMCall(pClient->handle, &callInfo, sizeof(callInfo));
+    if (RT_SUCCESS(rc))
         rc = callInfo.result;
-    }
     return rc;
 }
Index: /trunk/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR0LibSharedFolders.h
===================================================================
--- /trunk/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR0LibSharedFolders.h	(revision 58191)
+++ /trunk/src/VBox/Additions/common/VBoxGuestLib/VBoxGuestR0LibSharedFolders.h	(revision 58192)
@@ -29,4 +29,5 @@
 
 #include <VBox/VBoxGuestLib.h>
+#if 0 /* aparently no longer needed (see below) */
 #ifndef _NTIFS_
 # ifdef RT_OS_WINDOWS
@@ -55,14 +56,6 @@
 # endif
 #endif
+#endif
 
-#if defined(RT_OS_WINDOWS) && 0
-/** @todo remove this legacy and use VBox/log.h and/or iprt/log.h. */
-/* => Done.  The next person who needs logging in Windows guests will have the
- *    honour of making it work. */
-# ifdef DEBUG
-#  define LOG_ENABLED
-# endif
-# include "VBoxGuestLog.h"
-#endif
 #if defined(RT_OS_WINDOWS)
 # include <VBox/log.h>
@@ -87,4 +80,5 @@
 
 
+#if 0 /* Apparently unused cruft from old windows shared folder driver? */
 #define VBSF_DRIVE_LETTER_FIRST   L'A'
 #define VBSF_DRIVE_LETTER_LAST    L'Z'
@@ -133,13 +127,14 @@
 struct _MRX_VBOX_DEVICE_EXTENSION;
 typedef struct _MRX_VBOX_DEVICE_EXTENSION *PMRX_VBOX_DEVICE_EXTENSION;
+#endif
 
-DECLVBGL(int)  vboxInit (void);
-DECLVBGL(void) vboxUninit (void);
-DECLVBGL(int)  vboxConnect (PVBSFCLIENT pClient);
-DECLVBGL(void) vboxDisconnect (PVBSFCLIENT pClient);
+DECLVBGL(int)  vboxInit(void);
+DECLVBGL(void) vboxUninit(void);
+DECLVBGL(int)  vboxConnect(PVBSFCLIENT pClient);
+DECLVBGL(void) vboxDisconnect(PVBSFCLIENT pClient);
 
-DECLVBGL(int) vboxCallQueryMappings (PVBSFCLIENT pClient, SHFLMAPPING paMappings[], uint32_t *pcMappings);
+DECLVBGL(int) vboxCallQueryMappings(PVBSFCLIENT pClient, SHFLMAPPING paMappings[], uint32_t *pcMappings);
 
-DECLVBGL(int) vboxCallQueryMapName (PVBSFCLIENT pClient, SHFLROOT root, SHFLSTRING *pString, uint32_t size);
+DECLVBGL(int) vboxCallQueryMapName(PVBSFCLIENT pClient, SHFLROOT root, SHFLSTRING *pString, uint32_t size);
 
 /**
@@ -166,16 +161,16 @@
  *       as additional information.
  */
-DECLVBGL(int) vboxCallCreate (PVBSFCLIENT pClient, PVBSFMAP pMap, PSHFLSTRING pParsedPath, PSHFLCREATEPARMS pCreateParms);
+DECLVBGL(int) vboxCallCreate(PVBSFCLIENT pClient, PVBSFMAP pMap, PSHFLSTRING pParsedPath, PSHFLCREATEPARMS pCreateParms);
 
-DECLVBGL(int) vboxCallClose (PVBSFCLIENT pClient, PVBSFMAP pMap, SHFLHANDLE Handle);
-DECLVBGL(int) vboxCallRemove (PVBSFCLIENT pClient, PVBSFMAP pMap, PSHFLSTRING pParsedPath, uint32_t flags);
-DECLVBGL(int) vboxCallRename (PVBSFCLIENT pClient, PVBSFMAP pMap, PSHFLSTRING pSrcPath, PSHFLSTRING pDestPath, uint32_t flags);
-DECLVBGL(int) vboxCallFlush (PVBSFCLIENT pClient, PVBSFMAP pMap, SHFLHANDLE hFile);
+DECLVBGL(int) vboxCallClose(PVBSFCLIENT pClient, PVBSFMAP pMap, SHFLHANDLE Handle);
+DECLVBGL(int) vboxCallRemove(PVBSFCLIENT pClient, PVBSFMAP pMap, PSHFLSTRING pParsedPath, uint32_t flags);
+DECLVBGL(int) vboxCallRename(PVBSFCLIENT pClient, PVBSFMAP pMap, PSHFLSTRING pSrcPath, PSHFLSTRING pDestPath, uint32_t flags);
+DECLVBGL(int) vboxCallFlush(PVBSFCLIENT pClient, PVBSFMAP pMap, SHFLHANDLE hFile);
 
-DECLVBGL(int) vboxCallRead (PVBSFCLIENT pClient, PVBSFMAP pMap, SHFLHANDLE hFile, uint64_t offset, uint32_t *pcbBuffer, uint8_t *pBuffer, bool fLocked);
+DECLVBGL(int) vboxCallRead(PVBSFCLIENT pClient, PVBSFMAP pMap, SHFLHANDLE hFile, uint64_t offset, uint32_t *pcbBuffer, uint8_t *pBuffer, bool fLocked);
 DECLVBGL(int) VbglR0SharedFolderReadPageList(PVBSFCLIENT pClient, PVBSFMAP pMap, SHFLHANDLE hFile,
                                              uint64_t offset, uint32_t *pcbBuffer,
                                              uint16_t offFirstPage, uint16_t cPages, RTGCPHYS64 *paPages);
-DECLVBGL(int) vboxCallWrite (PVBSFCLIENT pClient, PVBSFMAP pMap, SHFLHANDLE hFile, uint64_t offset, uint32_t *pcbBuffer, uint8_t *pBuffer, bool fLocked);
+DECLVBGL(int) vboxCallWrite(PVBSFCLIENT pClient, PVBSFMAP 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, uint32_t *pcbBuffer, RTCCPHYS PhysBuffer);
 DECLVBGL(int) VbglR0SharedFolderWritePageList(PVBSFCLIENT pClient, PVBSFMAP pMap, SHFLHANDLE hFile,
@@ -183,17 +178,17 @@
                                               uint16_t offFirstPage, uint16_t cPages, RTGCPHYS64 *paPages);
 
-DECLVBGL(int) vboxCallLock (PVBSFCLIENT pClient, PVBSFMAP pMap, SHFLHANDLE hFile, uint64_t offset, uint64_t cbSize, uint32_t fLock);
+DECLVBGL(int) vboxCallLock(PVBSFCLIENT pClient, PVBSFMAP pMap, SHFLHANDLE hFile, uint64_t offset, uint64_t cbSize, uint32_t fLock);
 
-DECLVBGL(int) vboxCallDirInfo (PVBSFCLIENT pClient, PVBSFMAP pMap, SHFLHANDLE hFile,PSHFLSTRING ParsedPath, uint32_t flags,
-                               uint32_t index, uint32_t *pcbBuffer, PSHFLDIRINFO pBuffer, uint32_t *pcFiles);
-DECLVBGL(int) vboxCallFSInfo (PVBSFCLIENT pClient, PVBSFMAP pMap, SHFLHANDLE hFile, uint32_t flags, uint32_t *pcbBuffer, PSHFLDIRINFO pBuffer);
+DECLVBGL(int) vboxCallDirInfo(PVBSFCLIENT pClient, PVBSFMAP pMap, SHFLHANDLE hFile,PSHFLSTRING ParsedPath, uint32_t flags,
+                              uint32_t index, uint32_t *pcbBuffer, PSHFLDIRINFO pBuffer, uint32_t *pcFiles);
+DECLVBGL(int) vboxCallFSInfo(PVBSFCLIENT pClient, PVBSFMAP pMap, SHFLHANDLE hFile, uint32_t flags, uint32_t *pcbBuffer, PSHFLDIRINFO pBuffer);
 
-DECLVBGL(int) vboxCallMapFolder (PVBSFCLIENT pClient, PSHFLSTRING szFolderName, PVBSFMAP pMap);
-DECLVBGL(int) vboxCallUnmapFolder (PVBSFCLIENT pClient, PVBSFMAP pMap);
-DECLVBGL(int) vboxCallSetUtf8 (PVBSFCLIENT pClient);
+DECLVBGL(int) vboxCallMapFolder(PVBSFCLIENT pClient, PSHFLSTRING szFolderName, PVBSFMAP pMap);
+DECLVBGL(int) vboxCallUnmapFolder(PVBSFCLIENT pClient, PVBSFMAP pMap);
+DECLVBGL(int) vboxCallSetUtf8(PVBSFCLIENT pClient);
 
-DECLVBGL(int) vboxReadLink (PVBSFCLIENT pClient, PVBSFMAP pMap, PSHFLSTRING ParsedPath, uint32_t pcbBuffer, uint8_t *pBuffer);
-DECLVBGL(int) vboxCallSymlink (PVBSFCLIENT pClient, PVBSFMAP pMap, PSHFLSTRING pNewPath, PSHFLSTRING pOldPath, PSHFLFSOBJINFO pBuffer);
-DECLVBGL(int) vboxCallSetSymlinks (PVBSFCLIENT pClient);
+DECLVBGL(int) vboxReadLink(PVBSFCLIENT pClient, PVBSFMAP pMap, PSHFLSTRING ParsedPath, uint32_t pcbBuffer, uint8_t *pBuffer);
+DECLVBGL(int) vboxCallSymlink(PVBSFCLIENT pClient, PVBSFMAP pMap, PSHFLSTRING pNewPath, PSHFLSTRING pOldPath, PSHFLFSOBJINFO pBuffer);
+DECLVBGL(int) vboxCallSetSymlinks(PVBSFCLIENT pClient);
 
 #endif /* !___VBoxGuestLib_VBoxGuestR0LibSharedFolders_h */