WebSVN – SvarDOS – Diff – //tree/trunk/tree.c

     sprintf(serial, "%04X:%04X",
       serialNum.serialParts.b, serialNum.serialParts.a);
+}
-/* FindFile stuff to support optional NT API variant */
-typedef union WIN32_FIND_DATA_BOTH
-{
- WIN32_FIND_DATAW ud;
- WIN32_FIND_DATAA ad;
-} WIN32_FIND_DATA_BOTH;
 #ifndef STDCALL
 #define STDCALL __stdcall
 #endif
  * was found, and if so copies appropriate data into subdir and dsubdir.
  * It will repeat until a valid subdirectory is found or no more
  * are found, at which point it closes the FindFile search handle and
  * return INVALID_HANDLE_VALUE.  If successful, returns FindFile handle.
  */
-static HANDLE cycleFindResults(HANDLE findnexthnd, WIN32_FIND_DATA_BOTH *entry, char *subdir, char *dsubdir) {
+static HANDLE cycleFindResults(HANDLE findnexthnd, WIN32_FIND_DATAA *entry, char *subdir, char *dsubdir) {
   /* cycle through directory until 1st non . or .. directory is found. */
   do
+  {
     /* skip files & hidden or system directories */
-    if ((((entry->ad.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) == 0) ||
+    if ((((entry->dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) == 0) ||
-         ((entry->ad.dwFileAttributes &
+         ((entry->dwFileAttributes &
           (FILE_ATTRIBUTE_HIDDEN | FILE_ATTRIBUTE_SYSTEM)) != 0  && !dspAll) ) ||
-        ((strcmp(entry->ad.cFileName, ".") == 0) ||
+        ((strcmp(entry->cFileName, ".") == 0) ||
-         (strcmp(entry->ad.cFileName, "..") == 0)) )
+         (strcmp(entry->cFileName, "..") == 0)) )
+    {
-      if (FindNextFile(findnexthnd, &(entry->ad)) == 0)
+      if (FindNextFile(findnexthnd, entry) == 0)
+      {
         FindClose(findnexthnd);      // prevent resource leaks
         return INVALID_HANDLE_VALUE; // no subdirs found
+      }
+    }
     else
+    {
       /* set display name */
-      strcpy(dsubdir, entry->ad.cFileName);
+      strcpy(dsubdir, entry->cFileName);
       /* set canical name to use for further FindFile calls */
       /* use short file name if exists as lfn may contain unicode values converted
        * to default character (eg. ?) and so not a valid path.
        */
-      strcpy(subdir, entry->ad.cFileName);
+      strcpy(subdir, entry->cFileName);
       strcat(subdir, "\\");
+    }
   } while (!*subdir); // while (subdir is still blank)
   return findnexthnd;
+}
 /* FindFile buffer used by findFirstSubdir and findNextSubdir only */
-static WIN32_FIND_DATA_BOTH findSubdir_entry; /* current directory entry info    */
+static WIN32_FIND_DATAA findSubdir_entry; /* current directory entry info    */
 /**
  * Given the current path, find the 1st subdirectory.
  * The subdirectory found is stored in subdir.
  * subdir is cleared on error or no subdirectories.
   /* get handle for files in current directory (using wildcard spec) */
   strcpy(buffer, currentpath);
   strcat(buffer, "*");
-  dir = FindFirstFileA(buffer, &findSubdir_entry.ad);
+  dir = FindFirstFileA(buffer, &findSubdir_entry);
   if (dir == INVALID_HANDLE_VALUE)
+  {
     showInvalidPath(currentpath);
     return INVALID_HANDLE_VALUE;
+  }
  */
 static int findNextSubdir(HANDLE findnexthnd, char *subdir, char *dsubdir) {
   /* clear result path */
   strcpy(subdir, "");
-  if (FindNextFile(findnexthnd, &findSubdir_entry.ad) == 0) return 1; // no subdirs found
+  if (FindNextFile(findnexthnd, &findSubdir_entry) == 0) return 1; // no subdirs found
   if (cycleFindResults(findnexthnd, &findSubdir_entry, subdir, dsubdir) == INVALID_HANDLE_VALUE)
     return 1;
   else
     return 0;

Subversion Repositories SvarDOS

(root)//tree/trunk/tree.c – Rev 2037 → 2038