Changeset 21398 for trunk/src/msvcrt/dir.c

Timestamp:

Jul 28, 2010, 8:14:30 PM (15 years ago)

Author:

dmik

Message:

Build minivcrt.lib (accessible through minivcrt.h) that aims at providing MSVCRT-specific functions such as the wide character version of _getcwd() and similar to other runtimes.

File:

• trunk/src/msvcrt/dir.c (modified) (27 diffs)

trunk/src/msvcrt/dir.c

@@ -31 +31 @@
 #endif
 
+#ifndef __MINIVCRT__
+
 #include "wine/port.h"
 
@@ -49 +51 @@
 
 WINE_DEFAULT_DEBUG_CHANNEL(msvcrt);
+
+#else /* !__MINIVCRT__ */
+
+#include "minivcrt.h"
+#include "minivcrt_internal.h"
+
+#include "winternl.h"
+#include "wine/unicode.h"
+
+#include <errno.h>
+#include <stdlib.h>
+
+#endif /* !__MINIVCRT__ */
+
+#ifndef __MINIVCRT__
 
 /* INTERNAL: Translate finddata_t to PWIN32_FIND_DATAA */
@@ -70 +87 @@
 }
 
+#endif /* !__MINIVCRT__ */
+
 /* INTERNAL: Translate wfinddata_t to PWIN32_FIND_DATAA */
 static void msvcrt_wfttofd(LPWIN32_FIND_DATAW fd, struct _wfinddata_t* ft)
@@ -90 +109 @@
 }
 
+#ifndef __MINIVCRT__
+
 /*********************************************************************
  *              _chdir (MSVCRT.@)
@@ -103 +124 @@
 }
 
+#endif /* !__MINIVCRT__ */
+
 /*********************************************************************
  *              _wchdir (MSVCRT.@)
@@ -115 +138 @@
   return 0;
 }
+
+#ifndef __MINIVCRT__
 
 /*********************************************************************
@@ -166 +191 @@
 }
 
+#endif /* !__MINIVCRT__ */
+
 /*********************************************************************
  *              _wfindfirst (MSVCRT.@)
@@ -185 +212 @@
 }
 
+#ifndef __MINIVCRT__
+
 /*********************************************************************
  *              _findnext (MSVCRT.@)
@@ -194 +223 @@
   if (!FindNextFileA((HANDLE)hand, &find_data))
   {
-    *MSVCRT__errno() = MSVCRT_ENOENT;
+    *MSVCRT__errno() = MSVCRT(ENOENT);
     return -1;
   }
@@ -202 +231 @@
 }
 
+#endif /* !__MINIVCRT__ */
+
 /*********************************************************************
  *              _wfindnext (MSVCRT.@)
@@ -211 +242 @@
   if (!FindNextFileW((HANDLE)hand, &find_data))
   {
-    *MSVCRT__errno() = MSVCRT_ENOENT;
+    *MSVCRT__errno() = MSVCRT(ENOENT);
     return -1;
   }
@@ -218 +249 @@
   return 0;
 }
+
+#ifndef __MINIVCRT__
 
 /*********************************************************************
@@ -245 +278 @@
 }
 
+#endif /* !__MINIVCRT__ */
+
 /*********************************************************************
  *              _wgetcwd (MSVCRT.@)
@@ -264 +299 @@
   if (dir_len >= size)
   {
-    *MSVCRT__errno() = MSVCRT_ERANGE;
+    *MSVCRT__errno() = MSVCRT(ERANGE);
     return NULL; /* buf too small */
   }
@@ -270 +305 @@
   return buf;
 }
+
+#ifndef __MINIVCRT__
 
 /*********************************************************************
@@ -322 +359 @@
 }
 
+#endif /* !__MINIVCRT__ */
+
 /*********************************************************************
  *              _wgetdcwd (MSVCRT.@)
@@ -342 +381 @@
     if (GetDriveTypeW(drivespec) < DRIVE_REMOVABLE)
     {
-      *MSVCRT__errno() = MSVCRT_EACCES;
+      *MSVCRT__errno() = MSVCRT(EACCES);
       return NULL;
     }
@@ -349 +388 @@
     if (dir_len >= size || dir_len < 1)
     {
-      *MSVCRT__errno() = MSVCRT_ERANGE;
+      *MSVCRT__errno() = MSVCRT(ERANGE);
       return NULL; /* buf too small */
     }
@@ -360 +399 @@
   return buf;
 }
+
+#ifndef __MINIVCRT__
 
 /*********************************************************************
@@ -399 +440 @@
 }
 
+#endif /* !__MINIVCRT__ */
+
 /*********************************************************************
  *              _wmkdir (MSVCRT.@)
@@ -410 +453 @@
 }
 
+#ifndef __MINIVCRT__
+
 /*********************************************************************
  *              _rmdir (MSVCRT.@)
@@ -420 +465 @@
   return -1;
 }
+
+#endif /* !__MINIVCRT__ */
 
 /*********************************************************************
@@ -519 +566 @@
   }
 }
+
+#ifndef __MINIVCRT__
 
 /* INTERNAL: Helper for _fullpath. Modified PD code from 'snippets'. */
@@ -720 +769 @@
 }
 
+#endif /* !__MINIVCRT__ */
+
 /*********************************************************************
  *              _wmakepath (MSVCRT.@)
@@ -767 +818 @@
 }
 
+#ifndef __MINIVCRT__
+
 /*********************************************************************
  *              _searchenv (MSVCRT.@)
@@ -828 +881 @@
 }
 
+#endif /* !__MINIVCRT__ */
+
 MSVCRT_wchar_t* _wfullpath(MSVCRT_wchar_t* absPath,const MSVCRT_wchar_t* relPath,MSVCRT(size_t) size)
 {
@@ -836 +891 @@
 
    WideCharToMultiByte(CP_ACP, 0, relPath, -1, (LPSTR)asciirelPath, 280, NULL, NULL);
-   
+
    MSVCRT__fullpath(asciiabsPath, asciirelPath, size);
-   
+
    MultiByteToWideChar(CP_ACP, 0, asciiabsPath, -1, absPath, size);
 
-   return absPath;  
-}
+   return absPath;
+}