Changeset 21329 for trunk/src/kernel32/Fileio.cpp

Timestamp:

Jul 7, 2009, 7:40:22 PM (16 years ago)

Author:

vladest

Message:

Added functionality, required for Flash10 to kernel32

File:

• trunk/src/kernel32/Fileio.cpp (modified) (6 diffs)

trunk/src/kernel32/Fileio.cpp

@@ -1179 +1179 @@
   DWORD sp = 0, lp = 0,attr;
   LPSTR tmpshortpath,tmplongpath;
+  LPSTR lpszShortPath1, lpszLongPath1;
 
    dprintf(("GetLongPathNameA %s %x %d", lpszShortPath, lpszLongPath, cchBuffer));
@@ -1196 +1197 @@
       return 0;
    }
-  
-   lstrcpyA(tmpshortpath,lpszShortPath);
+
+   lpszShortPath1 = ODINHelperStripUNC((char*)lpszShortPath);
+   lpszLongPath1 = ODINHelperStripUNC((char*)lpszLongPath);
+
+   lstrcpyA(tmpshortpath,lpszShortPath1);
 
    /* check for drive letter */
-   if ( lpszShortPath[1] == ':' ) {
-      tmplongpath[0] = lpszShortPath[0];
+   if ( lpszShortPath1[1] == ':' ) {
+       tmplongpath[0] = lpszShortPath1[0];
+
       tmplongpath[1] = ':';
       sp = 2;
@@ -1209 +1214 @@
    //todo: check drive validity!
 
-   while ( lpszShortPath[lp] ) {
+   while ( lpszShortPath1[lp] ) {
 
       /* check for path delimiters and reproduce them */
-      if ( lpszShortPath[lp] == '\\' || lpszShortPath[lp] == '/' ) {
+      if ( lpszShortPath1[lp] == '\\' || lpszShortPath1[lp] == '/' ) {
         if (!sp || tmplongpath[sp-1]!= '\\') 
         {
@@ -1224 +1229 @@
       }
 
-      tmplen = strcspn ( lpszShortPath + lp, "\\/" ); 
-      lstrcpynA ( tmplongpath+sp, lpszShortPath + lp, tmplen+1 );
+      tmplen = strcspn ( lpszShortPath1 + lp, "\\/" );
+      lstrcpynA ( tmplongpath+sp, lpszShortPath1 + lp, tmplen+1 );
 
       attr = GetFileAttributesA(tmplongpath);
@@ -1266 +1271 @@
              DOSFS_Hash(FindFileData.cFileName, short_name, FALSE, TRUE );          
              //this happens on files like [hello world]
-             if (!lstrncmpA(short_name, lpszShortPath+lp, (lpszShortPath+lp+tmplen)[-1] == '.' ? tmplen-1 : tmplen )) 
+             if (!lstrncmpA(short_name, lpszShortPath1+lp, (lpszShortPath1+lp+tmplen)[-1] == '.' ? tmplen-1 : tmplen ))
              {
                strcpy( tmplongpath+sp, FindFileData.cFileName);
@@ -1299 +1304 @@
    tmplongpath[sp] = 0;
 
-   lstrcpynA ( lpszLongPath, tmplongpath, cchBuffer );
+   lstrcpynA ( lpszLongPath1, tmplongpath, cchBuffer );
    dprintf(("returning %s\n", lpszLongPath));
    tmplen = strlen ( lpszLongPath  );