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

Timestamp:

Jan 9, 2011, 5:54:29 PM (15 years ago)

Author:

dmik

Message:

kernel32: Fixed debug output in GetFullPathName*.

File:

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

trunk/src/kernel32/Fileio.cpp

@@ -242 +242 @@
  *             If the function fails, the return value is INVALID_HANDLE_VALUE
  * Remark    :
- * Status    : 
+ * Status    :
  *
  * Author    : SvL
@@ -251 +251 @@
                                  LPVOID lpSearchFilter,
                                  DWORD dwAdditionalFlags)
-{   
+{
   HANDLE hFind;
 
-    if(lpFileName == NULL || lpFindFileData == NULL || lpSearchFilter != NULL) 
+    if(lpFileName == NULL || lpFindFileData == NULL || lpSearchFilter != NULL)
     {
         dprintf(("!ERROR!: invalid parameter(s)"));
@@ -267 +267 @@
     }
     else
-    if(fSearchOp == FindExSearchLimitToDirectories) {     
+    if(fSearchOp == FindExSearchLimitToDirectories) {
         //NOTE: According to the SDK docs we are allowed to silently ignore this option
         dprintf(("!WARNING!: FindExSearchLimitToDirectories IGNORED"));
@@ -296 +296 @@
             filename[namelen-1] = 0;
         }
-        else  
+        else
             filename = (char *)lpFileName;
- 
+
         return (HANDLE)OSLibDosFindFirst(filename, (WIN32_FIND_DATAA *)lpFindFileData);
     }
@@ -306 +306 @@
         SetLastError(ERROR_INVALID_PARAMETER);
         break;
-    }      
+    }
     return INVALID_HANDLE_VALUE;
 }
@@ -334 +334 @@
  *             If the function fails, the return value is INVALID_HANDLE_VALUE
  * Remark    :
- * Status    : 
+ * Status    :
  *
  * Author    : Wine
@@ -367 +367 @@
     HeapFree( GetProcessHeap(), 0, pathA );
     if (handle == INVALID_HANDLE_VALUE) return handle;
-    
+
     switch(fInfoLevelId)
     {
@@ -608 +608 @@
   }
   //If the app is deleting a shellink file (.lnk), then we must delete the WPS object
-  if(OSLibIsShellLink((LPSTR)lpszFile)) 
+  if(OSLibIsShellLink((LPSTR)lpszFile))
   {
       OSLibWinDeleteObject((LPSTR)lpszFile);
@@ -638 +638 @@
 //******************************************************************************
 //******************************************************************************
-UINT WIN32API GetTempFileNameA(LPCSTR lpPathName, LPCSTR lpPrefixString, 
+UINT WIN32API GetTempFileNameA(LPCSTR lpPathName, LPCSTR lpPrefixString,
                                UINT uUnique, LPSTR lpTempFileName)
 {
@@ -848 +848 @@
     DWORD rc;
 
-    dprintf(("KERNEL32:  GetFullPathName called with %s %d %x", lpFileName, nBufferLength, lpBuffer));
+    dprintf(("KERNEL32: GetFullPathName(%s,%d,0x%X)", lpFileName, nBufferLength, lpBuffer));
 
     lpszFileName = strdup(lpFileName);
@@ -857 +857 @@
     rc = O32_GetFullPathName(lpszFileName, nBufferLength, lpBuffer, lpFilePart);
 
+#ifdef DEBUG
+    if (rc > nBufferLength) {
+        dprintf(("KERNEL32: GetFullPathName returns %d (needs a bgger buffer)", rc));
+    } else if (rc > 0) {
+        dprintf(("KERNEL32: GetFullPathName returns %d (%s,%s)", lpBuffer, *lpFilePart));
+    }
+#endif
+
     free(lpszFileName);
 
@@ -876 +884 @@
   rc = GetFullPathNameA(astring, nBufferLength,
                         asciibuffer, &asciipart);
-
-  dprintf(("KERNEL32: GetFullPathNameW %s returns %s\n%s",
-           astring,
-           asciibuffer, asciipart));
 
   if(rc>0 && rc<nBufferLength && asciibuffer)
@@ -925 +929 @@
                           DWORD fdwFlags)
 {
-  dprintf(("KERNEL32:  MoveFileExA %s to %s %x, not complete!\n", 
-           lpszOldFilename, 
+  dprintf(("KERNEL32:  MoveFileExA %s to %s %x, not complete!\n",
+           lpszOldFilename,
            lpszNewFilename,
            fdwFlags));
-  
+
   // this parameter combination is illegal
   if ( (fdwFlags & MOVEFILE_DELAY_UNTIL_REBOOT) &&
@@ -938 +942 @@
     return FALSE;
   }
-  
+
   // first, we take care about the special cases
   if (fdwFlags && MOVEFILE_DELAY_UNTIL_REBOOT)
@@ -946 +950 @@
     // this call is Microsoft ACMSETUP wanting to replace OLEPRO32.DLL
     // in the ODIN system directory, we are better skipping the call.
-    
+
     // Anyway, this is only supported under Windows NT
     fdwFlags &= ~MOVEFILE_DELAY_UNTIL_REBOOT;
-    
+
     // Until we support this, we have to intercept
     // lpszNewFilename == NULL
@@ -957 +961 @@
       dprintf(("KERNEL32-MoveFileExA: trying to delete file [%s], skipped.",
                lpszOldFilename));
-      
+
       SetLastError( NO_ERROR );
       return TRUE;
     }
   }
-  
+
   if (fdwFlags && MOVEFILE_COPY_ALLOWED)
   {
@@ -968 +972 @@
     // volumes, this flag controls if a copy operation is allowed.
   }
-  
+
   if (fdwFlags && MOVEFILE_REPLACE_EXISTING)
   {
-    // We can only attempt to 
+    // We can only attempt to
     // 1 move away the current file if existing,
     // 2 do the current move operation
@@ -977 +981 @@
     //   otherwise restore the original file
   }
-  
-  return OSLibDosMoveFile(lpszOldFilename, 
+
+  return OSLibDosMoveFile(lpszOldFilename,
                           lpszNewFilename);
 }
@@ -999 +1003 @@
 BOOL WIN32API MoveFileExW(LPCWSTR lpSrc, LPCWSTR lpDest, DWORD fdwFlags)
 {
-  dprintf(("KERNEL32: MoveFileExW %ls to %ls %x", 
-           lpSrc, 
+  dprintf(("KERNEL32: MoveFileExW %ls to %ls %x",
+           lpSrc,
            lpDest,
            fdwFlags));
-  
-  char *asciisrc, 
+
+  char *asciisrc,
        *asciidest;
   BOOL rc;
@@ -1013 +1017 @@
   else
     asciidest = NULL;
-  
-  rc = MoveFileExA(asciisrc, 
+
+  rc = MoveFileExA(asciisrc,
                    asciidest,
                    fdwFlags);
-  
+
   if (NULL != asciidest)
     FreeAsciiString(asciidest);
-  
+
   FreeAsciiString(asciisrc);
-  
+
   return(rc);
 }
@@ -1045 +1049 @@
   DWORD attr, sp = 0, lp = 0;
   int tmplen, drive;
- 
+
   dprintf(("KERNEL32:  GetShortPathNameA %s", lpszLongPath));
 
@@ -1066 +1070 @@
       return 0;
   }
-  
+
   lstrcpyA(tmplongpath,lpszLongPath);
-   
+
   /* check for drive letter */
   if ( lpszLongPath[1] == ':' ) {
@@ -1083 +1087 @@
       /* check for path delimiters and reproduce them */
       if ( lpszLongPath[lp] == '\\' || lpszLongPath[lp] == '/' ) {
-        if (!sp || tmpshortpath[sp-1]!= '\\') 
+        if (!sp || tmpshortpath[sp-1]!= '\\')
         {
             /* strip double "\\" */
@@ -1094 +1098 @@
       }
 
-      tmplen = strcspn ( lpszLongPath + lp, "\\/" ); 
+      tmplen = strcspn ( lpszLongPath + lp, "\\/" );
       lstrcpynA ( tmpshortpath+sp, lpszLongPath + lp, tmplen+1 );
 
@@ -1105 +1109 @@
 
       if (tmplongpath[lp + tmplen] == '\\')
-      { 
+      {
          tmplongpath[lp + tmplen] = 0;
          marker = 1;
@@ -1112 +1116 @@
       attr = GetFileAttributesA(tmplongpath);
 
-      if (attr == -1) 
+      if (attr == -1)
       {
          SetLastError ( ERROR_FILE_NOT_FOUND );
@@ -1120 +1124 @@
       }
 
-      DOSFS_Hash(tmpshortpath+sp, short_name, FALSE, TRUE );          
-       
+      DOSFS_Hash(tmpshortpath+sp, short_name, FALSE, TRUE );
+
       strcpy( tmpshortpath+sp, short_name);
       sp += strlen ( tmpshortpath+sp );
@@ -1127 +1131 @@
          tmplongpath[lp + tmplen] = '\\';
       lp += tmplen;
-      
+
     }
 
@@ -1182 +1186 @@
 
    dprintf(("GetLongPathNameA %s %x %d", lpszShortPath, lpszLongPath, cchBuffer));
-  
+
    if(!lpszShortPath) {
      SetLastError(ERROR_INVALID_PARAMETER);
@@ -1218 +1222 @@
       /* check for path delimiters and reproduce them */
       if ( lpszShortPath1[lp] == '\\' || lpszShortPath1[lp] == '/' ) {
-        if (!sp || tmplongpath[sp-1]!= '\\') 
+        if (!sp || tmplongpath[sp-1]!= '\\')
         {
             /* strip double "\\" */
@@ -1233 +1237 @@
 
       attr = GetFileAttributesA(tmplongpath);
-      if (attr != -1) 
+      if (attr != -1)
       {
         sp += tmplen;
@@ -1249 +1253 @@
             (tmplongpath+sp)[0] = '*';
             (tmplongpath+sp)[1] = 0;
-          }  
+          }
           else
           {
@@ -1257 +1261 @@
           hFind = FindFirstFileExA(tmplongpath, FindExInfoStandard, &FindFileData,
                                    FindExSearchNameMatch, NULL, 0 );
-           
+
           if (hFind == INVALID_HANDLE_VALUE)
           {
@@ -1269 +1273 @@
            do
            {
-             DOSFS_Hash(FindFileData.cFileName, short_name, FALSE, TRUE );          
+             DOSFS_Hash(FindFileData.cFileName, short_name, FALSE, TRUE );
              //this happens on files like [hello world]
              if (!lstrncmpA(short_name, lpszShortPath1+lp, (lpszShortPath1+lp+tmplen)[-1] == '.' ? tmplen-1 : tmplen ))
@@ -1280 +1284 @@
             }
             while (FindNextFileA(hFind, &FindFileData));
-            
-          // no FindClose() here or else GetLastError() will not give its error   
+
+          // no FindClose() here or else GetLastError() will not give its error
           if (GetLastError() == ERROR_NO_MORE_FILES)
           {
@@ -1292 +1296 @@
           FindClose(hFind);
         }
-        else 
+        else
         {
             // if this file can't be found in common or hashed files
@@ -1461 +1465 @@
  *****************************************************************************/
 
-BOOL WIN32API GetFileAttributesExW(LPCWSTR lpFileName, 
+BOOL WIN32API GetFileAttributesExW(LPCWSTR lpFileName,
                                    GET_FILEEX_INFO_LEVELS fInfoLevelId,
                                    LPVOID lpFileInformation)