Changeset 170

Timestamp:

Oct 20, 2018, 9:58:56 AM (6 years ago)

Author:

Valery V. Sedletski

Message:

vboxsf.ifs: Shared folders enhancements.

Location:

trunk/src/VBox/Additions/os2/VBoxSF

Files:

• Makefile.kmk (modified) (1 diff)
• VBoxSF.cpp (modified) (30 diffs)
• VBoxSFA.asm (modified) (1 diff)
• VBoxSFAttach.cpp (modified) (1 diff)
• VBoxSFFile.cpp (modified) (25 diffs)
• VBoxSFFind.cpp (modified) (25 diffs)
• VBoxSFInit.cpp (modified) (6 diffs)
• VBoxSFInternal.h (modified) (7 diffs)
• VBoxSFStr.cpp (modified) (1 diff)

trunk/src/VBox/Additions/os2/VBoxSF/Makefile.kmk ¶

@@ -20 +20 @@
 VBoxSF_INCS         := \
         . \
+        $(PATH_ROOT)/include \
         $(PATH_ROOT)/src/VBox/Additions/common/VBoxGuestLib \
         $(PATH_ROOT)/src/VBox/Additions/common/VBoxGuest \

trunk/src/VBox/Additions/os2/VBoxSF/VBoxSF.cpp ¶

@@ -6 +6 @@
 /*
  * Copyright (c) 2007 knut st. osmundsen <bird-src-spam@anduin.net>
+ * Copyright (c) 2015-2018 Valery V. Sedletski <_valerius-no-spam@mail.ru>
  *
  * Permission is hereby granted, free of charge, to any person
@@ -40 +41 @@
 #include <iprt/mem.h>
 
-VBSFCLIENT g_clientHandle = {0};
+APIRET APIENTRY parseFileName(const char *pszPath, PCDFSI pcdfsi,
+                              char *pszParsedPath, int *pcbParsedPath, VBGLSFMAP *map);
+
+VBGLSFCLIENT g_clientHandle = {0};
 
 
@@ -68 +72 @@
     PVBOXSFVP pvboxsfvp = (PVBOXSFVP)pvpfsd;
 
-    //__asm__ __volatile__ (".byte 0xcc\n\t");
-
     if (! pszDev)
     {
@@ -79 +81 @@
     {
         case 0: // Attach
-            dprintf("*pcbParm=%u, pszParm=%s\n", *pcbParm, pszParm);
             if (pszDev[1] != ':')
             {
@@ -91 +92 @@
                 goto FS32_ATTACHEXIT;
             }
-            dprintf("g_clientHandle=%lx\n", g_clientHandle);
             sharename = make_shflstring((char *)pszParm);
-            rc = vboxCallMapFolder(&g_clientHandle, sharename, &pvboxsfvp->map);
+            rc = VbglR0SfMapFolder(&g_clientHandle, sharename, &pvboxsfvp->map);
             strncpy(pvboxsfvp->szLabel, (char *)pszParm, 12);
             pvboxsfvp->szLabel[11] = '\0';
-            dprintf("pvboxsfvp->map=%lx\n", pvboxsfvp->map);
             free_shflstring(sharename);
             if (RT_FAILURE(rc))
             {
-                dprintf("vboxCallMapFolder rc=%d", rc);
+                dprintf("VbglR0SfMapFolder rc=%d", rc);
                 rc = ERROR_VOLUME_NOT_MOUNTED;
                 goto FS32_ATTACHEXIT;
@@ -117 +116 @@
 
         case 2: // Query
-            dprintf("pvboxsfvp->szLabel=%s\n", pvboxsfvp->szLabel);
-            dprintf("pvboxsfvp->map=%lx\n", pvboxsfvp->map);
             len = MIN(strlen(pvboxsfvp->szLabel) + 1, 12);
             if (*pcbParm >= sizeof(pvboxsfvp->szLabel) && pszParm)
@@ -156 +153 @@
     APIRET  rc = NO_ERROR;
     int32_t rv = 0;
-    VBSFMAP map;
+    VBGLSFMAP map;
     PVPFSI pvpfsi = NULL;
     PVPFSD pvpfsd = NULL;
@@ -174 +171 @@
     dprintf("map=%lx\n", map);
 
-    rv = vboxCallFSInfo(&g_clientHandle, &map, 0, 
+    rv = VbglR0SfFsInfo(&g_clientHandle, &map, 0, 
         (SHFL_INFO_GET | SHFL_INFO_VOLUME), &bytes, (PSHFLDIRINFO)&volume_info);
 
     if (RT_FAILURE(rv))
     {
-        dprintf("VBOXSF: vboxCallFSInfo failed (%d)\n", rv);
+        dprintf("VBOXSF: VbglR0SfFsInfo failed (%d)\n", rv);
         return vbox_err_to_os2_err(rv);
     }
@@ -315 +312 @@
 {
     APIRET hrc = NO_ERROR;
-    SHFLCREATEPARMS params;
-    PVPFSI pvpfsi = NULL;
-    PVPFSD pvpfsd = NULL;
-    PVBOXSFVP pvboxsfvp;
-    PSHFLSTRING path;
-    char *pwsz;
-    char *pszFullDir;
+    SHFLCREATEPARMS params = {0};
+    PSHFLSTRING path = NULL;
+    char *pszFullName = NULL;
+    int cbFullName;
+    VBGLSFMAP map;
+    char *pwsz = NULL;
     int rc;
 
@@ -331 +327 @@
             dprintf("chdir to: %s\n", pszDir);
 
-            FSH32_GETVOLPARM(pcdfsi->cdi_hVPB, &pvpfsi, &pvpfsd);
-
-            pvboxsfvp = (PVBOXSFVP)pvpfsd;
-
-            pszFullDir = (char *)RTMemAlloc(CCHMAXPATHCOMP);
-
-            if ( (pszDir[0] == '\\' || pszDir[1] == ':') )
-            {
-                // absolute path
-                strcpy(pszFullDir, (char *)pszDir);
-                dprintf("1\n");
-            }
-            else
-            {
-                // relative path
-                strcpy(pszFullDir, pcdfsi->cdi_curdir);
-
-                if (pszFullDir[strlen(pszFullDir) - 1] != '\\')
-                    strcat(pszFullDir, "\\");
-
-                strcat(pszFullDir, (char *)pszDir);
-                dprintf("2\n");
-            }
-
-            pszFullDir += 3;
-            //if (iCurDirEnd != 0xffff)
-            //{
-            //    pszFullDir += iCurDirEnd - 3;
-            //}
-
-            dprintf("pszFullDir=%s\n", pszFullDir);
-            pwsz = (char *)RTMemAlloc(2 * CCHMAXPATHCOMP);
-            vboxsfStrToUtf8(pwsz, (char *)pszFullDir);
+            pszFullName = (char *)RTMemAlloc(CCHMAXPATHCOMP + 1);
+
+            if (! pszFullName)
+            {
+                hrc = ERROR_NOT_ENOUGH_MEMORY;
+                goto FS32_CHDIREXIT;
+            }
+
+            cbFullName = CCHMAXPATHCOMP + 1;
+
+            hrc = parseFileName((char *)pszDir, pcdfsi, pszFullName, &cbFullName, &map);
+
+            if (hrc)
+            {
+                dprintf("Filename parse error!\n");
+                goto FS32_CHDIREXIT;
+            }
+
+            dprintf("pszFullName=%s\n", pszFullName);
+            pwsz = (char *)RTMemAlloc(2 * CCHMAXPATHCOMP + 2);
+            vboxsfStrToUtf8(pwsz, (char *)pszFullName);
 
             path = make_shflstring((char *)pwsz);
-            rc = vboxCallCreate(&g_clientHandle, &pvboxsfvp->map, path, &params);
-            free_shflstring(path);
-            RTMemFree(pwsz);
-            RTMemFree(pszFullDir);
+
+            params.Handle = SHFL_HANDLE_NIL;
+            params.CreateFlags = SHFL_CF_DIRECTORY | SHFL_CF_ACT_OPEN_IF_EXISTS | SHFL_CF_ACT_FAIL_IF_NEW | SHFL_CF_ACCESS_READ;
+            
+            rc = VbglR0SfCreate(&g_clientHandle, &map, path, &params);
 
             if (RT_SUCCESS(rc))
@@ -379 +364 @@
 
                 pcdfsd->cwd->handle = params.Handle;
-                pcdfsd->cwd->map = pvboxsfvp->map;
+                pcdfsd->cwd->map = map;
                 dprintf("success\n");
             }
@@ -391 +376 @@
 
         case CD_FREE: /* deallocate working directory */
-            vboxCallClose(&g_clientHandle, &pcdfsd->cwd->map, pcdfsd->cwd->handle);
+            VbglR0SfClose(&g_clientHandle, &pcdfsd->cwd->map, pcdfsd->cwd->handle);
             RTMemFree(pcdfsd->cwd);
             hrc = NO_ERROR;
@@ -401 +386 @@
 
 FS32_CHDIREXIT:
+    if (path)
+        RTMemFree(path);
+    if (pwsz)
+        RTMemFree(pwsz);
+    if (pszFullName)
+        RTMemFree(pszFullName);
+
     dprintf(" => %d\n", hrc);
     return hrc;
@@ -410 +402 @@
            PBYTE pEABuf, ULONG flag)
 {
-    SHFLCREATEPARMS params;
+    SHFLCREATEPARMS params = {0};
     APIRET hrc = NO_ERROR;
-    PVPFSI pvpfsi;
-    PVPFSD pvpfsd;
+    char *pszFullName = NULL;
+    int cbFullName;
     PVBOXSFVP pvboxsfvp;
-    PSHFLSTRING path;
-    char *pwsz;
+    PSHFLSTRING path = NULL;
+    char *pwsz = NULL;
+    VBGLSFMAP map;
     int rc;
 
@@ -424 +417 @@
     params.Info.cbObject = 0;
     params.CreateFlags = SHFL_CF_DIRECTORY | SHFL_CF_ACT_CREATE_IF_NEW |
-        SHFL_CF_ACT_FAIL_IF_EXISTS | SHFL_CF_ACCESS_READ;
-
-    FSH32_GETVOLPARM(pcdfsi->cdi_hVPB, &pvpfsi, &pvpfsd);
-
-    pvboxsfvp = (PVBOXSFVP)pvpfsd;
-
-    pwsz = (char *)RTMemAlloc(2 * CCHMAXPATHCOMP);
-    vboxsfStrToUtf8(pwsz, (char *)pszName);
+        SHFL_CF_ACT_FAIL_IF_EXISTS | SHFL_CF_ACCESS_READWRITE; //SHFL_CF_ACCESS_READ;
+
+    pszFullName = (char *)RTMemAlloc(CCHMAXPATHCOMP + 1);
+
+    if (! pszFullName)
+    {
+        hrc = ERROR_NOT_ENOUGH_MEMORY;
+        goto FS32_MKDIREXIT;
+    }
+
+    cbFullName = CCHMAXPATHCOMP + 1;
+
+    hrc = parseFileName((char *)pszName, pcdfsi, pszFullName, &cbFullName, &map);
+
+    if (hrc)
+    {
+        dprintf("Filename parse error!\n");
+        goto FS32_MKDIREXIT;
+    }
+
+    pwsz = (char *)RTMemAlloc(2 * CCHMAXPATHCOMP + 2);
+    vboxsfStrToUtf8(pwsz, (char *)pszFullName);
+    dprintf("path=%s\n", pwsz);
 
     path = make_shflstring((char *)pwsz);
-    rc = vboxCallCreate(&g_clientHandle, &pvboxsfvp->map, path, &params);
-    RTMemFree(path);
-    RTMemFree(pwsz);
+    rc = VbglR0SfCreate(&g_clientHandle, &map, path, &params);
 
     /** @todo r=ramshankar: we should perhaps also check rc here and change
@@ -442 +448 @@
     if (params.Handle == SHFL_HANDLE_NIL)
     {
+        dprintf("fail\n");
         hrc = vbox_err_to_os2_err(rc);
         goto FS32_MKDIREXIT;
     }
 
-    vboxCallClose(&g_clientHandle, &pvboxsfvp->map, params.Handle);
+    VbglR0SfClose(&g_clientHandle, &map, params.Handle);
     hrc = NO_ERROR;
 
 FS32_MKDIREXIT:
+    if (pszFullName)
+        RTMemFree(pszFullName);
+    if (path)
+        RTMemFree(path);
+    if (pwsz)
+        RTMemFree(pwsz);
+
     dprintf(" => %d\n", hrc);
     return hrc;
@@ -459 +473 @@
 {
     APIRET hrc = NO_ERROR;
-    PVPFSI pvpfsi;
-    PVPFSD pvpfsd;
-    PVBOXSFVP pvboxsfvp;
-    PSHFLSTRING path;
-    char *pwsz;
+    PSHFLSTRING path = NULL;
+    char *pszFullName = NULL;
+    int cbFullName;
+    VBGLSFMAP map;
+    char *pwsz = NULL;
     int rc;
 
     dprintf("VBOXSF: FS32_RMDIR(%s)\n", pszName);
 
-    FSH32_GETVOLPARM(pcdfsi->cdi_hVPB, &pvpfsi, &pvpfsd);
-
-    pvboxsfvp = (PVBOXSFVP)pvpfsd;
-
-    pwsz = (char *)RTMemAlloc(2 * CCHMAXPATHCOMP);
-    vboxsfStrToUtf8(pwsz, (char *)pszName);
+    pszFullName = (char *)RTMemAlloc(CCHMAXPATHCOMP + 1);
+
+    if (! pszFullName)
+    {
+        hrc = ERROR_NOT_ENOUGH_MEMORY;
+        goto FS32_RMDIREXIT;
+    }
+
+    cbFullName = CCHMAXPATHCOMP + 1;
+
+    hrc = parseFileName((char *)pszName, pcdfsi, pszFullName, &cbFullName, &map);
+
+    if (hrc)
+    {
+        dprintf("Filename parse error!\n");
+        goto FS32_RMDIREXIT;
+    }
+
+    pwsz = (char *)RTMemAlloc(2 * CCHMAXPATHCOMP + 2);
+    vboxsfStrToUtf8(pwsz, (char *)pszFullName);
 
     path = make_shflstring((char *)pwsz);
-    rc = vboxCallRemove(&g_clientHandle, &pvboxsfvp->map, path, SHFL_REMOVE_DIR);
-    RTMemFree(path);
-    RTMemFree(pwsz);
+    rc = VbglR0SfRemove(&g_clientHandle, &map, path, SHFL_REMOVE_DIR);
 
     hrc = vbox_err_to_os2_err(rc);
 
 FS32_RMDIREXIT:
+    if (pszFullName)
+        RTMemFree(pszFullName);
+    if (path)
+        RTMemFree(path);
+    if (pwsz)
+        RTMemFree(pwsz);
+
     dprintf(" => %d\n", hrc);
     return hrc;
@@ -502 +535 @@
 {
     APIRET hrc = NO_ERROR;
-    PVPFSI pvpfsi;
-    PVPFSD pvpfsd;
-    PVBOXSFVP pvboxsfvp;
-    PSHFLSTRING oldpath, newpath;
-    char *pwszFrom, *pwszTo;
+    PSHFLSTRING oldpath = NULL, newpath = NULL;
+    char *pszFullSrc = NULL;
+    int cbFullSrc;
+    char *pszFullDst = NULL;
+    int cbFullDst;
+    VBGLSFMAP map;
+    char *pwszSrc = NULL, *pwszDst = NULL;
     int rc;
 
     dprintf("VBOXSF: FS32_MOVE(%s, %s, %lx)\n", pszSrc, pszDst, flag);
 
-    FSH32_GETVOLPARM(pcdfsi->cdi_hVPB, &pvpfsi, &pvpfsd);
-
-    pvboxsfvp = (PVBOXSFVP)pvpfsd;
-
-    pwszFrom = (char *)RTMemAlloc(2 * CCHMAXPATHCOMP);
-    pwszTo = (char *)RTMemAlloc(2 * CCHMAXPATHCOMP);
-    vboxsfStrToUtf8(pwszFrom, (char *)pszSrc);
-    vboxsfStrToUtf8(pwszTo, (char *)pszDst);
-
-    oldpath = make_shflstring((char *)pwszFrom);
-    newpath = make_shflstring((char *)pwszTo);
-
-    rc = vboxCallRename(&g_clientHandle, &pvboxsfvp->map, oldpath, newpath, SHFL_RENAME_FILE | SHFL_RENAME_REPLACE_IF_EXISTS);
-    RTMemFree(oldpath);
-    RTMemFree(newpath);
-    RTMemFree(pwszFrom);
-    RTMemFree(pwszTo);
+    pszFullSrc = (char *)RTMemAlloc(CCHMAXPATHCOMP + 1);
+
+    if (! pszFullSrc)
+    {
+        hrc = ERROR_NOT_ENOUGH_MEMORY;
+        goto FS32_MOVEEXIT;
+    }
+
+    cbFullSrc = CCHMAXPATHCOMP + 1;
+
+    hrc = parseFileName((char *)pszSrc, pcdfsi, pszFullSrc, &cbFullSrc, &map);
+
+    if (hrc)
+    {
+        dprintf("Filename parse error!\n");
+        goto FS32_MOVEEXIT;
+    }
+
+    pszFullDst = (char *)RTMemAlloc(CCHMAXPATHCOMP + 1);
+
+    if (! pszFullDst)
+    {
+        hrc = ERROR_NOT_ENOUGH_MEMORY;
+        goto FS32_MOVEEXIT;
+    }
+
+    cbFullDst = CCHMAXPATHCOMP + 1;
+
+    hrc = parseFileName((char *)pszDst, pcdfsi, pszFullDst, &cbFullDst, &map);
+
+    if (hrc)
+    {
+        dprintf("Filename parse error!\n");
+        goto FS32_MOVEEXIT;
+    }
+
+    pwszSrc = (char *)RTMemAlloc(2 * CCHMAXPATHCOMP + 2);
+    pwszDst = (char *)RTMemAlloc(2 * CCHMAXPATHCOMP + 2);
+
+    vboxsfStrToUtf8(pwszSrc, (char *)pszFullSrc);
+    vboxsfStrToUtf8(pwszDst, (char *)pszFullDst);
+
+    oldpath = make_shflstring((char *)pwszSrc);
+    newpath = make_shflstring((char *)pwszDst);
+
+    rc = VbglR0SfRename(&g_clientHandle, &map, oldpath, newpath, SHFL_RENAME_FILE | SHFL_RENAME_REPLACE_IF_EXISTS);
 
     hrc = vbox_err_to_os2_err(rc);
 
 FS32_MOVEEXIT:
+    if (oldpath)
+        RTMemFree(oldpath);
+    if (newpath)
+        RTMemFree(newpath);
+    if (pwszSrc)
+        RTMemFree(pwszSrc);
+    if (pwszDst)
+        RTMemFree(pwszDst);
+    if (pszFullSrc)
+        RTMemFree(pszFullSrc);
+    if (pszFullDst)
+        RTMemFree(pszFullDst);
+
     dprintf(" => %d\n", hrc);
     return hrc;
@@ -541 +618 @@
 {
     APIRET hrc = NO_ERROR;
-    PVPFSI pvpfsi;
-    PVPFSD pvpfsd;
-    PVBOXSFVP pvboxsfvp;
-    PSHFLSTRING path;
-    char *pwsz;
+    PSHFLSTRING path = NULL;
+    char *pwsz = NULL;
+    char *pszFullName = NULL;
+    int cbFullName;
+    VBGLSFMAP map;
     int rc;
 
     dprintf("VBOXSF: FS32_DELETE(%s)\n", pszFile);
 
-    FSH32_GETVOLPARM(pcdfsi->cdi_hVPB, &pvpfsi, &pvpfsd);
-
-    pvboxsfvp = (PVBOXSFVP)pvpfsd;
-
-    pwsz = (char *)RTMemAlloc(2 * CCHMAXPATHCOMP);
-    vboxsfStrToUtf8(pwsz, (char *)pszFile);
+    pszFullName = (char *)RTMemAlloc(CCHMAXPATHCOMP + 1);
+
+    if (! pszFullName)
+    {
+        hrc = ERROR_NOT_ENOUGH_MEMORY;
+        goto FS32_DELETEEXIT;
+    }
+
+    cbFullName = CCHMAXPATHCOMP + 1;
+
+    hrc = parseFileName((char *)pszFile, pcdfsi, pszFullName, &cbFullName, &map);
+
+    if (hrc)
+    {
+        dprintf("Filename parse error!\n");
+        goto FS32_DELETEEXIT;
+    }
+
+    pwsz = (char *)RTMemAlloc(2 * CCHMAXPATHCOMP + 2);
+    vboxsfStrToUtf8(pwsz, (char *)pszFullName);
 
     path = make_shflstring((char *)pwsz);
-    rc = vboxCallRemove(&g_clientHandle, &pvboxsfvp->map, path, SHFL_REMOVE_FILE);
-    RTMemFree(path);
-    RTMemFree(pwsz);
+    rc = VbglR0SfRemove(&g_clientHandle, &map, path, SHFL_REMOVE_FILE);
 
     hrc = vbox_err_to_os2_err(rc);
 
 FS32_DELETEEXIT:
+    if (pszFullName)
+        RTMemFree(pszFullName);
+    if (path)
+        RTMemFree(path);
+    if (pwsz)
+        RTMemFree(pwsz);
+
     dprintf(" => %d\n", hrc);
     return hrc;
@@ -573 +669 @@
 FS32_FILEATTRIBUTE(ULONG flag, PCDFSI pcdfsi, PVBOXSFCD pcdfsd, PCSZ pszName, USHORT iCurDirEnd, PUSHORT pAttr)
 {
-    SHFLCREATEPARMS params;
+    SHFLCREATEPARMS params = {0};
     APIRET hrc = NO_ERROR;
-    PVPFSI pvpfsi;
-    PVPFSD pvpfsd;
-    PVBOXSFVP pvboxsfvp;
     PSHFLDIRINFO file = NULL;
     uint32_t len = sizeof(SHFLDIRINFO);
-    uint32_t num_files = 0;
-    uint32_t index = 0;
-    char *str, *p, *lastslash;
-    char *pszDirName;
-    PSHFLSTRING path, path2;
-    char *pwsz;
+    PSHFLSTRING path = NULL;
+    char *pwsz = NULL;
+    char *pszFullName = NULL;
+    int cbFullName;
+    VBGLSFMAP map;
     int rc;
 
     dprintf("VBOXSF: FS32_FILEATTRIBUTE(%lx, %s)\n", flag, pszName);
 
-    FSH32_GETVOLPARM(pcdfsi->cdi_hVPB, &pvpfsi, &pvpfsd);
-
-    pvboxsfvp = (PVBOXSFVP)pvpfsd;
-
     switch (flag)
     {
         case 0: // retrieve
-            pwsz = (char *)RTMemAlloc(2 * CCHMAXPATHCOMP);
-            vboxsfStrToUtf8(pwsz, (char *)pszName);
-
-            path = make_shflstring((char *)pwsz);
-
-            str = (char *)RTMemAlloc(strlen((char *)pszName) + 1);
-
-            if (! str)
-            {
-                dprintf("Not enough memory 2\n");
+            file = (PSHFLDIRINFO)RTMemAlloc(len);
+
+            if (! file)
+            {
+                dprintf("Not enough memory 1\n");
                 hrc = ERROR_NOT_ENOUGH_MEMORY;
                 goto FS32_FILEATTRIBUTEEXIT;
             }
 
-            strcpy(str, (char *)pszName);
-
-            lastslash = p = str;
-
-            // get last backslash
-            do {
-                lastslash = p;
-                p = strchr(p + 1, '\\');
-            } while (p && p < str + strlen(str));
-
-            // cut off file part from directory part
-            str[lastslash - str + 1] = '\0';
-            pszDirName = str + 1;
-
-            dprintf("pszDirName=%s\n", pszDirName);
-
-            pwsz = (char *)RTMemAlloc(2 * CCHMAXPATHCOMP);
-            vboxsfStrToUtf8(pwsz, (char *)pszDirName);
+            pszFullName = (char *)RTMemAlloc(CCHMAXPATHCOMP + 1);
+
+            if (! pszFullName)
+            {
+                hrc = ERROR_NOT_ENOUGH_MEMORY;
+                goto FS32_FILEATTRIBUTEEXIT;
+            }
+
+            cbFullName = CCHMAXPATHCOMP + 1;
+
+            hrc = parseFileName((char *)pszName, pcdfsi, pszFullName, &cbFullName, &map);
+
+            if (hrc)
+            {
+                dprintf("Filename parse error!\n");
+                goto FS32_FILEATTRIBUTEEXIT;
+            }
+
+            pwsz = (char *)RTMemAlloc(2 * CCHMAXPATHCOMP + 2);
+            vboxsfStrToUtf8(pwsz, (char *)pszFullName);
 
             path = make_shflstring((char *)pwsz);
-            rc = vboxCallCreate(&g_clientHandle, &pvboxsfvp->map, path, &params);
-            free_shflstring(path);
-            RTMemFree(pwsz);
-            RTMemFree(str);
+
+            params.Handle = SHFL_HANDLE_NIL;
+            params.CreateFlags = SHFL_CF_LOOKUP | SHFL_CF_ACT_FAIL_IF_NEW;
+
+            rc = VbglR0SfCreate(&g_clientHandle, &map, path, &params);
 
             if (!RT_SUCCESS(rc))
             {
-                dprintf("vboxCallCreate returned %d\n", rc);
-                free_shflstring(path);
+                dprintf("VbglR0SfCreate returned %d\n", rc);
                 hrc = vbox_err_to_os2_err(rc);
                 goto FS32_FILEATTRIBUTEEXIT;
@@ -645 +730 @@
 
             dprintf("path=%s\n", pszName);
-            dprintf("pvboxsfvp->map=%x\n", pvboxsfvp->map);
+            dprintf("map=%x\n", map);
             dprintf("params.Handle=%x\n", params.Handle);
             dprintf("len=%x\n", len);
-            dprintf("num_files=%x\n", num_files);
-
-            //path = make_shflstring(str);
-
-            rc = vboxCallFSInfo(&g_clientHandle, &pvboxsfvp->map, params.Handle,
+
+            rc = VbglR0SfFsInfo(&g_clientHandle, &map, params.Handle,
                                 SHFL_INFO_GET | SHFL_INFO_FILE, &len, file);
 
@@ -659 +741 @@
             if (RT_FAILURE(rc))
             {
-                dprintf("vboxCallFSInfo failed: %d\n", rc);
+                dprintf("VbglR0SfFsInfo failed: %d\n", rc);
                 goto FS32_FILEATTRIBUTEEXIT;
             }
 
-            vboxCallClose(&g_clientHandle, &pvboxsfvp->map, params.Handle);
+            VbglR0SfClose(&g_clientHandle, &map, params.Handle);
 
             *pAttr = VBoxToOS2Attr(file->Info.Attr.fMode);
@@ -673 +755 @@
 
 FS32_FILEATTRIBUTEEXIT:
+    if (file)
+        RTMemFree(file);
+    if (path)
+        RTMemFree(path);
+    if (pwsz)
+        RTMemFree(pwsz);
+    if (pszFullName)
+        RTMemFree(pszFullName);
+
     dprintf(" => %d\n", hrc);
     return hrc;
@@ -685 +776 @@
     SHFLCREATEPARMS params = {0};
     USHORT usNeededSize;
-    PVPFSI pvpfsi;
-    PVPFSD pvpfsd;
-    PVBOXSFVP pvboxsfvp;
     PSHFLDIRINFO file = NULL;
     uint32_t len = sizeof(SHFLDIRINFO);
-    uint32_t num_files = 0;
-    uint32_t index = 0;
-    char *str, *p, *lastslash;
-    char *pszDirName;
-    PSHFLSTRING path, path2;
-    char *pwsz, pwsz2;
+    PSHFLSTRING path = NULL;
+    char *pwsz = NULL;
+    char *pszFullName = NULL;
+    int cbFullName;
+    VBGLSFMAP map;
     int rc;
 
     dprintf("VBOXSF: FS32_PATHINFO(%x, %s, %x)\n", flag, pszName, level);
 
-    FSH32_GETVOLPARM(pcdfsi->cdi_hVPB, &pvpfsi, &pvpfsd);
-
-    pvboxsfvp = (PVBOXSFVP)pvpfsd;
-
-    str = (char *)RTMemAlloc(strlen((char *)pszName) + 1);
-
-    if (! str)
-    {
-        dprintf("Not enough memory 2\n");
+    pszFullName = (char *)RTMemAlloc(CCHMAXPATHCOMP + 1);
+
+    if (! pszFullName)
+    {
         hrc = ERROR_NOT_ENOUGH_MEMORY;
         goto FS32_PATHINFOEXIT;
     }
 
-    strcpy(str, (char *)pszName);
-
-    lastslash = p = str;
-
-    // get last backslash
-    do {
-        lastslash = p;
-        p = strchr(p + 1, '\\');
-    } while (p && p < str + strlen(str));
-
-    // cut off file part from directory part
-    str[lastslash - str + 1] = '\0';
-    pszDirName = str + 1;
-
-    dprintf("pszDirName=%s\n", pszDirName);
-
-    pwsz = (char *)RTMemAlloc(2 * CCHMAXPATHCOMP);
-    vboxsfStrToUtf8(pwsz, (char *)pszDirName);
+    cbFullName = CCHMAXPATHCOMP + 1;
+
+    hrc = parseFileName((char *)pszName, pcdfsi, pszFullName, &cbFullName, &map);
+
+    if (hrc)
+    {
+        dprintf("Filename parse error!\n");
+        goto FS32_PATHINFOEXIT;
+    }
+
+    pwsz = (char *)RTMemAlloc(2 * CCHMAXPATHCOMP + 2);
+    vboxsfStrToUtf8(pwsz, (char *)pszFullName);
 
     path = make_shflstring((char *)pwsz);
-    rc = vboxCallCreate(&g_clientHandle, &pvboxsfvp->map, path, &params);
-    RTMemFree(pwsz);
-    RTMemFree(str);
-
-    if (!RT_SUCCESS(rc))
-    {
-        dprintf("vboxCallCreate returned %d\n", rc);
-        free_shflstring(path);
+
+    params.Handle = SHFL_HANDLE_NIL;
+    params.CreateFlags = SHFL_CF_ACT_FAIL_IF_NEW; // SHFL_CF_LOOKUP
+
+    rc = VbglR0SfCreate(&g_clientHandle, &map, path, &params);
+
+    if (! RT_SUCCESS(rc))
+    {
+        dprintf("VbglR0SfCreate returned %d\n", rc);
         hrc = vbox_err_to_os2_err(rc);
         goto FS32_PATHINFOEXIT;
@@ -746 +823 @@
 
     dprintf("path=%s\n", pszName);
-    dprintf("pvboxsfvp->map=%x\n", pvboxsfvp->map);
+    dprintf("map=%x\n", map);
     dprintf("params.Handle=%x\n", params.Handle);
     dprintf("len=%x\n", len);
-    dprintf("num_files=%x\n", num_files);
-
-    //path = make_shflstring(str);
 
     switch (flag)
@@ -803 +877 @@
                 dprintf("file=%x\n", file);
 
-                rc = vboxCallFSInfo(&g_clientHandle, &pvboxsfvp->map, params.Handle,
+                rc = VbglR0SfFsInfo(&g_clientHandle, &map, params.Handle,
                                     SHFL_INFO_GET | SHFL_INFO_FILE, &len, file);
 
@@ -810 +884 @@
                 if (RT_FAILURE(rc))
                 {
-                    dprintf("vboxCallFSInfo failed: %d\n", rc);
+                    dprintf("VbglR0SfFsInfo failed: %d\n", rc);
                     goto FS32_PATHINFOEXIT;
                 }
@@ -995 +1069 @@
                             EAOP filestatus;
                             KernCopyIn(&filestatus, pData, sizeof(EAOP));
-                            PFEALIST pFEA = filestatus.fpFEAList;
+                            PFEALIST pFEA = (PFEALIST)KernSelToFlat((ULONG)filestatus.fpFEAList);
                             // @todo: get empty EAs
                             memset(pFEA, 0, (USHORT)pFEA->cbList);
                             pFEA->cbList = sizeof(pFEA->cbList);
-                            KernCopyOut(pData, &filestatus, sizeof(FILESTATUS4L));
+                            KernCopyOut(pData, &filestatus, sizeof(EAOP));
                             break;
                         }
 
-                    case 4:
+                    case 4: // FIL_QUERYALLEAS
                         {
                             EAOP filestatus;
                             KernCopyIn(&filestatus, pData, sizeof(EAOP));
-                            PFEALIST pFEA = filestatus.fpFEAList;
+                            PFEALIST pFEA = (PFEALIST)KernSelToFlat((ULONG)filestatus.fpFEAList);
                             memset(pFEA, 0, (USHORT)pFEA->cbList);
                             pFEA->cbList = sizeof(pFEA->cbList);
-                            KernCopyOut(pData, &filestatus, sizeof(FILESTATUS4L));
+                            KernCopyOut(pData, &filestatus, sizeof(EAOP));
                             break;
                         }
@@ -1167 +1241 @@
                 }
 
-                rc = vboxCallFSInfo(&g_clientHandle, &pvboxsfvp->map, params.Handle,
+                rc = VbglR0SfFsInfo(&g_clientHandle, &map, params.Handle,
                                     SHFL_INFO_SET | SHFL_INFO_FILE, &len, file);
 
                 if (RT_FAILURE(rc))
                 {
-                    dprintf("vboxCallFSInfo failed: %d\n", rc);
+                    dprintf("VbglR0SfFsInfo failed: %d\n", rc);
                     hrc = vbox_err_to_os2_err(rc);
                     goto FS32_PATHINFOEXIT;
@@ -1184 +1258 @@
 
 FS32_PATHINFOEXIT:
+    if (pwsz)
+        RTMemFree(pwsz);
+    if (path)
+        RTMemFree(path);
     if (file)
         RTMemFree(file);
+    if (pszFullName)
+        RTMemFree(pszFullName);
 
     if (params.Handle)
-        vboxCallClose(&g_clientHandle, &pvboxsfvp->map, params.Handle);
+        VbglR0SfClose(&g_clientHandle, &map, params.Handle);
 
     dprintf(" => %d\n", hrc);

trunk/src/VBox/Additions/os2/VBoxSF/VBoxSFA.asm ¶

@@ -6 +6 @@
 ;
 ; Copyright (c) 2007 knut st. osmundsen <bird-src-spam@anduin.net>
+; Copyright (c) 2015-2018 Valery V. Sedletski <_valerius-no-spam@mail.ru>
 ;
 ; Permission is hereby granted, free of charge, to any person

trunk/src/VBox/Additions/os2/VBoxSF/VBoxSFAttach.cpp ¶

@@ +1 @@
+/** $Id: VBoxSF.cpp 161 2018-04-10 00:36:59Z valerius $ */
+/** @file
+ * VBoxSF - OS/2 Shared Folders, the FS and FSD level IFS EPs
+ */
+
+/*
+ * Copyright (c) 2007 knut st. osmundsen <bird-src-spam@anduin.net>
+ * Copyright (c) 2015-2018 Valery V. Sedletski <_valerius-no-spam@mail.ru>
+ *
+ * Permission is hereby granted, free of charge, to any person
+ * obtaining a copy of this software and associated documentation
+ * files (the "Software"), to deal in the Software without
+ * restriction, including without limitation the rights to use,
+ * copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following
+ * conditions:
+ *
+ * The above copyright notice and this permission notice shall be
+ * included in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+ * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+ * OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+ * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+ * HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ * WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ */
+
 #define  OS2EMX_PLAIN_CHAR
 #define  INCL_DOSFILEMGR

trunk/src/VBox/Additions/os2/VBoxSF/VBoxSFFile.cpp ¶

@@ -6 +6 @@
 /*
  * Copyright (c) 2007 knut st. osmundsen <bird-src-spam@anduin.net>
+ * Copyright (c) 2015-2018 Valery V. Sedletski <_valerius-no-spam@mail.ru>
  *
  * Permission is hereby granted, free of charge, to any person
@@ -40 +41 @@
 #include <iprt/assert.h>
 
-extern VBSFCLIENT g_clientHandle;
+extern VBGLSFCLIENT g_clientHandle;
+
+uint32_t VBoxToOS2Attr(uint32_t fMode);
 
 /**
@@ -50 +53 @@
  */
 APIRET APIENTRY parseFileName(const char *pszPath, PCDFSI pcdfsi,
-                              char *pszParsedPath, int *pcbParsedPath, VBSFMAP *map)
+                              char *pszParsedPath, int *pcbParsedPath, VBGLSFMAP *map)
 {
     PVPFSI pvpfsi;
@@ -114 +117 @@
                 PUSHORT pusAction, USHORT usAttr, PBYTE pcEABuf, PUSHORT pfgenflag)
 {
-    SHFLCREATEPARMS params;
+    SHFLCREATEPARMS params = {0};
     APIRET hrc = NO_ERROR;
     char *pszFullName;
     int cbFullName;
-    VBSFMAP map;
+    VBGLSFMAP map;
     char *pwsz;
     PSHFLSTRING path;
@@ -124 +127 @@
     PVPFSD pvpfsd;
     PVBOXSFVP pvboxsfvp;
+    RTTIME time;
+    FDATE d;
+    FTIME t;
     int rc;
 
@@ -131 +137 @@
     params.Handle = SHFL_HANDLE_NIL;
 
-    pszFullName = (char *)RTMemAlloc(CCHMAXPATHCOMP);
-    cbFullName = CCHMAXPATHCOMP;
+    pszFullName = (char *)RTMemAlloc(CCHMAXPATHCOMP + 1);
+
+    if (! pszFullName)
+    {
+        hrc = ERROR_NOT_ENOUGH_MEMORY;
+        goto FS32_OPENCREATEEXIT;
+    }
+
+    cbFullName = CCHMAXPATHCOMP + 1;
 
     hrc = parseFileName((char *)pszName, pcdfsi, pszFullName, &cbFullName, &map);
@@ -199 +212 @@
         params.CreateFlags &= ~SHFL_CF_ACCESS_ATTR_WRITE;
 
-    pwsz = (char *)RTMemAlloc(2 * CCHMAXPATHCOMP);
+    pwsz = (char *)RTMemAlloc(2 * CCHMAXPATHCOMP + 2);
     vboxsfStrToUtf8(pwsz, (char *)pszFullName);
 
     path = make_shflstring((char *)pwsz);
-    rc = vboxCallCreate(&g_clientHandle, &map, path, &params);
+    rc = VbglR0SfCreate(&g_clientHandle, &map, path, &params);
     RTMemFree(pwsz);
     RTMemFree(pszFullName);
@@ -209 +222 @@
     if (!RT_SUCCESS(rc))
     {
-        dprintf("vboxCallCreate returned %d\n", rc);
+        dprintf("VbglR0SfCreate returned %d\n", rc);
         free_shflstring(path);
         hrc = vbox_err_to_os2_err(rc);
@@ -228 +241 @@
     psffsd->filebuf->handle = params.Handle;
     psffsd->filebuf->path = path;
+
+    psffsi->sfi_positionl = 0;
+    psffsi->sfi_position = 0;
+
+    psffsi->sfi_sizel = params.Info.cbObject;
+    psffsi->sfi_size = (LONG)params.Info.cbObject;
+
+    /* Creation time   */
+    RTTimeExplode(&time, &params.Info.BirthTime);
+
+    t.hours = time.u8Hour;
+    t.minutes = time.u8Minute;
+    t.twosecs = time.u8Second / 2;
+    d.year = time.i32Year - 1980;
+    d.month = time.u8Month;
+    d.day = time.u8MonthDay;
+    psffsi->sfi_ctime = *(PUSHORT)&t;
+    psffsi->sfi_cdate = *(PUSHORT)&d;
+
+    /* Last access time   */
+    RTTimeExplode(&time, &params.Info.AccessTime);
+
+    t.hours = time.u8Hour;
+    t.minutes = time.u8Minute;
+    t.twosecs = time.u8Second / 2;
+    d.year = time.i32Year - 1980;
+    d.month = time.u8Month;
+    d.day = time.u8MonthDay;
+    psffsi->sfi_atime = *(PUSHORT)&t;
+    psffsi->sfi_adate = *(PUSHORT)&d;
+
+    /* Last write time   */
+    RTTimeExplode(&time, &params.Info.ModificationTime);
+
+    t.hours = time.u8Hour;
+    t.minutes = time.u8Minute;
+    t.twosecs = time.u8Second / 2;
+    d.year = time.i32Year - 1980;
+    d.month = time.u8Month;
+    d.day = time.u8MonthDay;
+    psffsi->sfi_mtime = *(PUSHORT)&t;
+    psffsi->sfi_mdate = *(PUSHORT)&d;
+
+    // @todo omit ST_SCREAT | ST_PCREAT if not creating the file
+    psffsi->sfi_tstamp = ST_SCREAT | ST_PCREAT | ST_SREAD | ST_PREAD | ST_SWRITE | ST_PWRITE;
+
+    psffsi->sfi_DOSattr = VBoxToOS2Attr(params.Info.Attr.fMode);
 
 FS32_OPENCREATEEXIT:
@@ -257 +317 @@
     pvboxsfvp = (PVBOXSFVP)pvpfsd;
 
-    rc = vboxCallClose(&g_clientHandle, &pvboxsfvp->map, filebuf->handle);
+    rc = VbglR0SfClose(&g_clientHandle, &pvboxsfvp->map, filebuf->handle);
     hrc = vbox_err_to_os2_err(rc);
     free_shflstring(filebuf->path);
@@ -329 +389 @@
 {
     APIRET hrc = NO_ERROR;
-    SHFLCREATEPARMS params;
+    SHFLCREATEPARMS params = {0};
     USHORT usNeededSize;
-    PSHFLSTRING path;
     PVPFSI pvpfsi;
     PVPFSD pvpfsd;
@@ -337 +396 @@
     PSHFLDIRINFO file = NULL;
     uint32_t len = sizeof(SHFLDIRINFO);
-    uint32_t num_files = 0;
-    uint32_t index = 0;
-    char *str, *p, *lastslash;
-    char *pszDirName;
-    char *pwsz;
     int rc;
 
@@ -398 +452 @@
                 }
 
-                dprintf("file=%x\n", file);
-
-                str = (char *)RTMemAlloc(psffsd->filebuf->path->u16Length);
-
-                if (! str)
+                dprintf("pvboxsfvp->map=%x\n", pvboxsfvp->map);
+                dprintf("psffsd->filebuf->handle=%x\n", psffsd->filebuf->handle);
+
+                rc = VbglR0SfFsInfo(&g_clientHandle, &pvboxsfvp->map, psffsd->filebuf->handle,
+                                    SHFL_INFO_GET | SHFL_INFO_FILE, &len, file);
+
+                hrc = vbox_err_to_os2_err(rc);
+
+                if (RT_FAILURE(rc))
                 {
-                    dprintf("Not enough memory 2\n");
-                    hrc = ERROR_NOT_ENOUGH_MEMORY;
+                    dprintf("VbglR0SfFsInfo failed: %d\n", rc);
                     goto FS32_FILEINFOEXIT;
                 }
-
-                strcpy(str, "\\");
-                strcat(str, (char *)psffsd->filebuf->path->String.utf8);
-
-                lastslash = p = str;
-
-                // get last backslash
-                do {
-                    lastslash = p;
-                    p = strchr(p + 1, '\\');
-                } while (p && p < str + strlen(str));
-
-                // cut off file part from directory part
-                str[lastslash - str + 1] = '\0';
-                pszDirName = str + 1;
-
-                dprintf("pszDirName=%s\n", pszDirName);
-
-                pwsz = (char *)RTMemAlloc(2 * CCHMAXPATHCOMP);
-                vboxsfStrToUtf8(pwsz, (char *)pszDirName);
-
-                path = make_shflstring((char *)pwsz);
-                rc = vboxCallCreate(&g_clientHandle, &pvboxsfvp->map, path, &params);
-                RTMemFree(pwsz);
-                RTMemFree(str);
-
-                if (!RT_SUCCESS(rc))
-                {
-                    dprintf("vboxCallCreate returned %d\n", rc);
-                    free_shflstring(path);
-                    hrc = vbox_err_to_os2_err(rc);
-                    goto FS32_FILEINFOEXIT;
-                }
-
-                dprintf("path=%s\n", psffsd->filebuf->path->String.utf8);
-                dprintf("pvboxsfvp->map=%x\n", pvboxsfvp->map);
-                dprintf("params.Handle=%x\n", params.Handle);
-                dprintf("len=%x\n", len);
-                dprintf("num_files=%x\n", num_files);
-
-                rc = vboxCallFSInfo(&g_clientHandle, &pvboxsfvp->map, params.Handle,
-                                    SHFL_INFO_GET | SHFL_INFO_FILE, &len, file);
-
-                hrc = vbox_err_to_os2_err(rc);
-
-                if (RT_FAILURE(rc))
-                {
-                    dprintf("vboxCallFSInfo failed: %d\n", rc);
-                    goto FS32_FILEINFOEXIT;
-                }
-
-                vboxCallClose(&g_clientHandle, &pvboxsfvp->map, params.Handle);
 
                 if (level == FIL_STANDARD    || level == FIL_STANDARDL ||
@@ -681 +686 @@
                             EAOP filestatus;
                             KernCopyIn(&filestatus, pData, sizeof(EAOP));
-                            PFEALIST pFEA = filestatus.fpFEAList;
+                            PFEALIST pFEA = (PFEALIST)KernSelToFlat((ULONG)filestatus.fpFEAList);
                             // @todo: get empty EAs
                             memset(pFEA, 0, (USHORT)pFEA->cbList);
                             pFEA->cbList = sizeof(pFEA->cbList);
-                            KernCopyOut(pData, &filestatus, sizeof(FILESTATUS4L));
+                            KernCopyOut(pData, &filestatus, sizeof(EAOP));
                             break;
                         }
 
-                    case 4:
+                    case 4: // FIL_QUERYALLEAS
                         {
                             EAOP filestatus;
                             KernCopyIn(&filestatus, pData, sizeof(EAOP));
-                            PFEALIST pFEA = filestatus.fpFEAList;
+                            PFEALIST pFEA = (PFEALIST)KernSelToFlat((ULONG)filestatus.fpFEAList);
                             memset(pFEA, 0, (USHORT)pFEA->cbList);
                             pFEA->cbList = sizeof(pFEA->cbList);
-                            KernCopyOut(pData, &filestatus, sizeof(FILESTATUS4L));
+                            KernCopyOut(pData, &filestatus, sizeof(EAOP));
                             break;
                         }
@@ -922 +927 @@
                 }
 
-                rc = vboxCallFSInfo(&g_clientHandle, &pvboxsfvp->map, psffsd->filebuf->handle,
+                rc = VbglR0SfFsInfo(&g_clientHandle, &pvboxsfvp->map, psffsd->filebuf->handle,
                                     SHFL_INFO_SET | SHFL_INFO_FILE, &len, file);
 
                 if (RT_FAILURE(rc))
                 {
-                    dprintf("vboxCallFSInfo failed: %d\n", rc);
+                    dprintf("VbglR0SfFsInfo failed: %d\n", rc);
                     hrc = vbox_err_to_os2_err(rc);
                     goto FS32_FILEINFOEXIT;
@@ -939 +944 @@
 
 FS32_FILEINFOEXIT:
-    dprintf("file=%x\n", file);
-    //__asm__ __volatile__ (".byte 0xcc\n\t");
     if (file)
         RTMemFree(file);
+
     dprintf(" => %d\n", hrc);
     return hrc;
 }
 
+int chsize(PVBOXSFVP pvboxsfvp, PVBOXSFFSD psffsd, ULONG size)
+{
+    PSHFLFSOBJINFO pObjInfo = NULL;
+    uint32_t cbBuf = sizeof(SHFLFSOBJINFO);
+    int rc;
+
+    pObjInfo = (PSHFLFSOBJINFO)RTMemAlloc(cbBuf);
+
+    if (! pObjInfo)
+    {
+        return VERR_NO_MEMORY;
+    }
+
+    memset(pObjInfo, 0, cbBuf);
+    pObjInfo->cbObject = size;
+
+    rc = VbglR0SfFsInfo(&g_clientHandle, &pvboxsfvp->map, psffsd->filebuf->handle,
+                        SHFL_INFO_SET | SHFL_INFO_SIZE, &cbBuf, (PSHFLDIRINFO)pObjInfo);
+
+    if (pObjInfo)
+        RTMemFree(pObjInfo);
+
+    return rc;
+}
 
 DECLASM(int)
@@ -955 +983 @@
     PVPFSD pvpfsd;
     PVBOXSFVP pvboxsfvp;
-    PSHFLFSOBJINFO pObjInfo = NULL;
     PSHFLSTRING path;
-    uint32_t cbBuf = sizeof(SHFLFSOBJINFO);
     int rc;
 
@@ -966 +992 @@
     pvboxsfvp = (PVBOXSFVP)pvpfsd;
 
-    pObjInfo = (PSHFLFSOBJINFO)RTMemAlloc(cbBuf);
-    if (!pObjInfo)
-    {
-        hrc = ERROR_NOT_ENOUGH_MEMORY;
-        goto FS32_NEWSIZELEXIT;
-    }
-
-    memset(pObjInfo, 0, cbBuf);
-    pObjInfo->cbObject = cbFile;
-
-    rc = vboxCallFSInfo(&g_clientHandle, &pvboxsfvp->map, psffsd->filebuf->handle,
-                        SHFL_INFO_SET | SHFL_INFO_SIZE, &cbBuf, (PSHFLDIRINFO)pObjInfo);
+    rc = chsize(pvboxsfvp, psffsd, cbFile);
 
     hrc = vbox_err_to_os2_err(rc);
@@ -983 +998 @@
 FS32_NEWSIZELEXIT:
     dprintf(" => %d\n", hrc);
-
-    if (pObjInfo)
-        RTMemFree(pObjInfo);
 
     return hrc;
@@ -999 +1011 @@
     PVBOXSFVP pvboxsfvp;
     uint8_t *pBuf;
+    ULONG cb = *pcb;
     int rc;
 
@@ -1009 +1022 @@
     pBuf = (uint8_t *)RTMemAlloc(*pcb);
 
-    rc = vboxCallRead(&g_clientHandle, &pvboxsfvp->map, psffsd->filebuf->handle, 
+    if (psffsi->sfi_positionl > psffsi->sfi_sizel)
+    {
+        *pcb = 0;
+    }
+    else if (*pcb > psffsi->sfi_sizel - psffsi->sfi_positionl)
+    {
+        *pcb = psffsi->sfi_sizel - psffsi->sfi_positionl;
+    }
+
+    memset(pBuf, 0, cb);
+
+    rc = VbglR0SfRead(&g_clientHandle, &pvboxsfvp->map, psffsd->filebuf->handle, 
                       psffsi->sfi_positionl, (uint32_t *)pcb, pBuf, false);
 
@@ -1019 +1043 @@
     }
 
+    psffsi->sfi_tstamp |= (ST_SREAD | ST_PREAD);
+
     hrc = vbox_err_to_os2_err(rc);
-    RTMemFree(pBuf);
 
 FS32_READEXIT:
+    if (pBuf)
+        RTMemFree(pBuf);
+
     dprintf(" => %d\n", hrc);
     return hrc;
@@ -1035 +1063 @@
     PVPFSD pvpfsd;
     PVBOXSFVP pvboxsfvp;
+    uint32_t cbNewPos;
     uint8_t *pBuf;
     int rc;
@@ -1045 +1074 @@
 
     pBuf = (uint8_t *)RTMemAlloc(*pcb);
+
+    if (! pBuf)
+    {
+        hrc = ERROR_NOT_ENOUGH_MEMORY;
+        goto FS32_WRITEEXIT;
+    }
+
     KernCopyIn(pBuf, (char *)pvData, *pcb);
 
-    rc = vboxCallWrite(&g_clientHandle, &pvboxsfvp->map, psffsd->filebuf->handle, 
+    cbNewPos = psffsi->sfi_positionl + *pcb;
+
+    if (cbNewPos > psffsi->sfi_sizel)
+    {
+        rc = chsize(pvboxsfvp, psffsd, cbNewPos);
+
+        if (rc)
+        {
+            hrc = vbox_err_to_os2_err(rc);
+            goto FS32_WRITEEXIT;
+        }
+
+        psffsi->sfi_sizel = cbNewPos;
+        psffsi->sfi_size  = cbNewPos;
+    }
+
+    rc = VbglR0SfWrite(&g_clientHandle, &pvboxsfvp->map, psffsd->filebuf->handle, 
                        psffsi->sfi_positionl, (uint32_t *)pcb, pBuf, false);
 
@@ -1054 +1106 @@
         psffsi->sfi_positionl += *pcb;
         psffsi->sfi_position  += *pcb;
+        psffsi->sfi_tstamp |= (ST_SWRITE | ST_PWRITE);
     }
 
     hrc = vbox_err_to_os2_err(rc);
-    RTMemFree(pBuf);
 
 FS32_WRITEEXIT:
+    if (pBuf)
+        RTMemFree(pBuf);
+
     dprintf(" => %d\n", hrc);
     return hrc;

trunk/src/VBox/Additions/os2/VBoxSF/VBoxSFFind.cpp ¶

@@ -6 +6 @@
 /*
  * Copyright (c) 2007 knut st. osmundsen <bird-src-spam@anduin.net>
+ * Copyright (c) 2015-2018 Valery V. Sedletski <_valerius-no-spam@mail.ru>
  *
  * Permission is hereby granted, free of charge, to any person
@@ -40 +41 @@
 #include <iprt/assert.h>
 
-extern VBSFCLIENT g_clientHandle;
+extern VBGLSFCLIENT g_clientHandle;
 
 
@@ -95 +96 @@
     *pcMatch = 0;
 
-    dprintf("usEntriesWanted=%u\n", usEntriesWanted);
-
     switch (level)
     {
@@ -159 +158 @@
         }
 
-        rc = vboxCallDirInfo(&g_clientHandle, &pFindBuf->map, pFindBuf->handle, pFindBuf->path, 0, pFindBuf->index,
+        rc = VbglR0SfDirInfo(&g_clientHandle, &pFindBuf->map, pFindBuf->handle, pFindBuf->path, 0, pFindBuf->index,
                              &pFindBuf->len, pFindBuf->buf, &pFindBuf->num_files);
 
         if (rc != 0 && rc != VERR_NO_MORE_FILES)
         {
-            dprintf("vboxCallDirInfo failed: %d\n", rc);
+            dprintf("VbglR0SfDirInfo failed: %d\n", rc);
             RTMemFree(pFindBuf->buf);
             hrc = vbox_err_to_os2_err(rc);
@@ -177 +176 @@
             goto FILLFINDBUFEXIT;
         }
-
-        dprintf("num_files=%lu\n", pFindBuf->num_files);
     }
 
@@ -226 +223 @@
                     char *pszFileName = (char *)file->name.String.utf8;
                     RTTIME time;
-                    dprintf("FIL_STANDARD\n");
                     memset(&findbuf, 0, sizeof(findbuf));
                     /* File name */
@@ -232 +228 @@
                         CCHMAXPATHCOMP, file->name.u16Length);
                     findbuf.cchName = strlen(findbuf.achName);
-                    dprintf("findbuf.achName=%s\n", findbuf.achName);
-                    dprintf("findbuf.cchName=%u\n", findbuf.cchName);
                     /* File attributes */
                     findbuf.attrFile = VBoxToOS2Attr(file->Info.Attr.fMode);
@@ -283 +277 @@
                     char *pszFileName = (char *)file->name.String.utf8;
                     RTTIME time;
-                    dprintf("FIL_STANDARDL\n");
                     memset(&findbuf, 0, sizeof(findbuf));
                     /* File name */
@@ -289 +282 @@
                         CCHMAXPATHCOMP, file->name.u16Length);
                     findbuf.cchName = strlen(findbuf.achName);
-                    dprintf("findbuf.achName=%s\n", findbuf.achName);
-                    dprintf("findbuf.cchName=%u\n", findbuf.cchName);
                     /* File attributes */
                     findbuf.attrFile = VBoxToOS2Attr(file->Info.Attr.fMode);
@@ -340 +331 @@
                     char *pszFileName = (char *)file->name.String.utf8;
                     RTTIME time;
-                    dprintf("FIL_QUERYEASIZE\n");
                     memset(&findbuf, 0, sizeof(findbuf));
                     /* File name */
@@ -346 +336 @@
                         CCHMAXPATHCOMP, file->name.u16Length);
                     findbuf.cchName = strlen(findbuf.achName);
-                    dprintf("findbuf.achName=%s\n", findbuf.achName);
-                    dprintf("findbuf.cchName=%u\n", findbuf.cchName);
                     /* File attributes */
                     findbuf.attrFile = VBoxToOS2Attr(file->Info.Attr.fMode);
@@ -390 +378 @@
                     findbuf.cbList = file->Info.Attr.u.EASize.cb;
                     KernCopyOut(pbData, &findbuf, cbSize);
-                    dprintf("cbList=%lu\n", findbuf.cbList);
                     break;
                 }
@@ -398 +385 @@
                     FILEFNDBUF4L findbuf;
                     RTTIME time;
-                    dprintf("FIL_QUERYEASIZEL\n");
                     char *pszFileName = (char *)file->name.String.utf8;
                     memset(&findbuf, 0, sizeof(findbuf));
@@ -405 +391 @@
                         CCHMAXPATHCOMP, file->name.u16Length);
                     findbuf.cchName = strlen(findbuf.achName);
-                    dprintf("findbuf.achName=%s\n", findbuf.achName);
-                    dprintf("findbuf.cchName=%u\n", findbuf.cchName);
                     /* File attributes */
                     findbuf.attrFile = VBoxToOS2Attr(file->Info.Attr.fMode);
@@ -449 +433 @@
                     findbuf.cbList = file->Info.Attr.u.EASize.cb;
                     KernCopyOut(pbData, &findbuf, cbSize);
-                    dprintf("cbList=%lu\n", findbuf.cbList);
                     break;
                 }
@@ -456 +439 @@
                 {
                     FILEFNDBUF3 findbuf;
-                    dprintf("FIL_QUERYEASFROMLIST\n");
                     char *pszFileName = (char *)file->name.String.utf8;
                     RTTIME time;
@@ -464 +446 @@
                         CCHMAXPATHCOMP, file->name.u16Length);
                     findbuf.cchName = strlen(findbuf.achName);
-                    dprintf("findbuf.achName=%s\n", findbuf.achName);
-                    dprintf("findbuf.cchName=%u\n", findbuf.cchName);
                     /* File attributes */
                     findbuf.attrFile = VBoxToOS2Attr(file->Info.Attr.fMode);
@@ -513 +493 @@
                 {
                     FILEFNDBUF3L findbuf;
-                    dprintf("FIL_QUERYEASFROMLISTL\n");
                     char *pszFileName = (char *)file->name.String.utf8;
                     RTTIME time;
@@ -521 +500 @@
                         CCHMAXPATHCOMP, file->name.u16Length);
                     findbuf.cchName = strlen(findbuf.achName);
-                    dprintf("findbuf.achName=%s\n", findbuf.achName);
-                    dprintf("findbuf.cchName=%u\n", findbuf.cchName);
                     /* File attributes */
                     findbuf.attrFile = VBoxToOS2Attr(file->Info.Attr.fMode);
@@ -574 +551 @@
 
         (*pcMatch)++;
-        dprintf("*pcMatch=%u\n", *pcMatch);
 
         pbData += cbSize;
@@ -594 +570 @@
                USHORT level, USHORT flags)
 {
-    SHFLCREATEPARMS params;
+    SHFLCREATEPARMS params = {0};
     PFINDBUF pFindBuf;
     PSHFLSTRING path;
@@ -663 +639 @@
     dprintf("str=%s\n", str);
 
-    pwsz = (char *)RTMemAlloc(2 * CCHMAXPATHCOMP);
+    pwsz = (char *)RTMemAlloc(2 * CCHMAXPATHCOMP + 2);
     vboxsfStrToUtf8(pwsz, str);
 
     path = make_shflstring(pwsz);
-    rc = vboxCallCreate(&g_clientHandle, &pvboxsfvp->map, path, &params);
+    rc = VbglR0SfCreate(&g_clientHandle, &pvboxsfvp->map, path, &params);
     free_shflstring(path);
     RTMemFree(pwsz);
@@ -693 +669 @@
             dprintf("wildcard: %s\n", str);
 
-            pwsz = (char *)RTMemAlloc(2 * CCHMAXPATHCOMP);
+            pwsz = (char *)RTMemAlloc(2 * CCHMAXPATHCOMP + 2);
             vboxsfStrToUtf8(pwsz, str);
 
@@ -708 +684 @@
     else
     {
-        dprintf("VBOXSF: vboxCallCreate: %d\n", rc);
+        dprintf("VBOXSF: VbglR0SfCreate: %d\n", rc);
         hrc = vbox_err_to_os2_err(rc);
         goto FS32_FINDFIRSTEXIT;
@@ -750 +726 @@
     dprintf("FS32_FINDCLOSE\n");
 
-    vboxCallClose(&g_clientHandle, &pFindBuf->map, pFindBuf->handle);
+    VbglR0SfClose(&g_clientHandle, &pFindBuf->map, pFindBuf->handle);
     free_shflstring(pFindBuf->path);
     RTMemFree(pFindBuf);

trunk/src/VBox/Additions/os2/VBoxSF/VBoxSFInit.cpp ¶

@@ -6 +6 @@
 /*
  * Copyright (c) 2007 knut st. osmundsen <bird-src-spam@anduin.net>
+ * Copyright (c) 2015-2018 Valery V. Sedletski <_valerius-no-spam@mail.ru>
  *
  * Permission is hereby granted, free of charge, to any person
@@ -52 +53 @@
 /* from sys0.asm and the linker/end.lib. */
 extern char _text, _etext, _data, _end;
-extern VBSFCLIENT g_clientHandle;
+extern VBGLSFCLIENT g_clientHandle;
 RT_C_DECLS_END
 
@@ -65 +66 @@
  * The caller will do the necessary AttachDD and calling of the 16 bit
  * IDC to initialize the g_VBoxGuestIDC global. Perhaps we should move
- * this bit to VbglInit? It's just that it's so much simpler to do it
+ * this bit to VbglInitClient? It's just that it's so much simpler to do it
  * while we're on the way here...
  *
  */
-DECLASM(void)
-VBoxSFR0Init(void)
+DECLASM(void) VBoxSFR0Init(void)
 {
     APIRET rc;
@@ -84 +84 @@
         &&  VALID_PTR(g_VBoxGuestIDC.pfnServiceEP))
     {
+#if 0 // ???
+        int rc = RTR0Init(0);
+        if (RT_SUCCESS(rc))
+        {
+            rc = VbglInitClient();
+            if (RT_SUCCESS(rc))
+            {
+#endif // ???
 #ifndef DONT_LOCK_SEGMENTS
         /*
@@ -99 +107 @@
 #endif
         /* Initialize VBox subsystem. */
-        rc = vboxInit();
+        rc = VbglR0SfInit();
         if (RT_FAILURE(rc))
         {
@@ -107 +115 @@
         /* Connect the HGCM client */
         RT_ZERO(g_clientHandle);
-        rc = vboxConnect(&g_clientHandle);
+        rc = VbglR0SfConnect(&g_clientHandle);
         if (RT_FAILURE(rc))
         {
             dprintf("VBOXSF: %s: ERROR while connecting to host (%Rrc)!\n", __FUNCTION__, rc);
-            vboxUninit();
+            VbglR0SfTerm();
         }
 
-        rc = vboxCallSetUtf8(&g_clientHandle);
+        rc = VbglR0SfSetUtf8(&g_clientHandle);
         if (RT_FAILURE(rc))
         {
-            dprintf("VBOXSF: vboxCallSetUtf8 failed. rc=%d\n", rc);
+            dprintf("VBOXSF: VbglR0SfSetUtf8 failed. rc=%d\n", rc);
         }
 

trunk/src/VBox/Additions/os2/VBoxSF/VBoxSFInternal.h ¶

@@ -6 +6 @@
 /*
  * Copyright (c) 2007 knut st. osmundsen <bird-src-spam@anduin.net>
+ * Copyright (c) 2015-2018 Valery V. Sedletski <_valerius-no-spam@mail.ru>
  *
  * Permission is hereby granted, free of charge, to any person
@@ -42 +43 @@
 #undef RT_MAX
 
-#include <VBoxGuestR0LibSharedFolders.h>
+#include <VBox/VBoxGuestLibSharedFolders.h>
 
 #include <iprt/types.h>
@@ -128 +129 @@
 {
     SHFLHANDLE handle;
-    VBSFMAP map;
+    VBGLSFMAP map;
 } CWD, *PCWD;
 
@@ -145 +146 @@
 {
     uint32_t u32Dummy;
-    VBSFMAP  map;
+    VBGLSFMAP  map;
     char szLabel[12];
 } VBOXSFVP;
@@ -195 +196 @@
     uint32_t bAttr;
     uint32_t bMustAttr;
-    VBSFMAP  map;
+    VBGLSFMAP  map;
 } FINDBUF, *PFINDBUF;
 
@@ -222 +223 @@
 APIRET APIENTRY vboxsfStrToUtf8(char *dst, char *src);
 APIRET APIENTRY parseFileName(const char *pszPath, PCDFSI pcdfsi,
-                              char *pszParsedPath, int *cbParsedPath, VBSFMAP *map);
+                              char *pszParsedPath, int *cbParsedPath, VBGLSFMAP *map);
 
 RT_C_DECLS_BEGIN
@@ -242 +243 @@
 
 #endif
-

trunk/src/VBox/Additions/os2/VBoxSF/VBoxSFStr.cpp ¶

@@ -6 +6 @@
 /*
  * Copyright (c) 2007 knut st. osmundsen <bird-src-spam@anduin.net>
+ * Copyright (c) 2015-2018 Valery V. Sedletski <_valerius-no-spam@mail.ru>
  *
  * Permission is hereby granted, free of charge, to any person