Changeset 21402 for trunk/src/msvcrt/file.c

Timestamp:

Jul 30, 2010, 1:01:07 PM (15 years ago)

Author:

dmik

Message:

Added more wide character versions of RT functions to minivcrt.lib.

File:

• trunk/src/msvcrt/file.c (modified) (22 diffs)

trunk/src/msvcrt/file.c

@@ -35 +35 @@
 #include <time.h>
 
+#ifndef __MINIVCRT__
 
 #include "winternl.h"
@@ -59 +60 @@
 WINE_DEFAULT_DEBUG_CHANNEL(msvcrt);
 
+#else /* !__MINIVCRT__ */
+
+#include <fcntl.h>
+#include <sys/stat.h>
+#include <wctype.h>
+
+#include <winerror.h>
+
+#include "minivcrt.h"
+#include "minivcrt_internal.h"
+
+#include "winternl.h"
+#include "wine/unicode.h"
+
+#endif /* !__MINIVCRT__ */
+
+#ifndef __MINIVCRT__
+
 /* for stat mode, permissions apply to all,owner and group */
 #define MSVCRT_S_IREAD  (_S_IREAD  | (_S_IREAD  >> 3) | (_S_IREAD  >> 6))
@@ -66 +85 @@
 /* _access() bit flags FIXME: incomplete */
 #define MSVCRT_W_OK      0x02
-
 
 /* FIXME: Make this dynamic */
@@ -94 +112 @@
 static const unsigned int COM = 'c' << 16 | 'o' << 8 | 'm';
 
+#else /* !__MINIVCRT__ */
+
+/* for stat mode, permissions apply to all,owner and group */
+#define MSVCRT_S_IREAD  (S_IRUSR | S_IRGRP | S_IROTH)
+#define MSVCRT_S_IWRITE (S_IWUSR | S_IWGRP | S_IWOTH)
+#define MSVCRT_S_IEXEC  (S_IXUSR | S_IXGRP | S_IXOTH)
+
+#define MSVCRT_W_OK     W_OK
+#define _S_IWRITE       S_IWUSR
+#define _S_IFDIR        S_IFDIR
+#define _S_IFREG        S_IFREG
+
+#define MSVCRT_iswalpha iswalpha
+
+#endif /* !__MINIVCRT__ */
+
 #define TOUL(x) (ULONGLONG)(x)
 static const ULONGLONG WCEXE = TOUL('e') << 32 | TOUL('x') << 16 | TOUL('e');
@@ -99 +133 @@
 static const ULONGLONG WCCMD = TOUL('c') << 32 | TOUL('m') << 16 | TOUL('d');
 static const ULONGLONG WCCOM = TOUL('c') << 32 | TOUL('o') << 16 | TOUL('m');
+
+#ifndef __MINIVCRT__
 
 extern CRITICAL_SECTION MSVCRT_file_cs;
@@ -296 +332 @@
 }
 
+#endif /* !__MINIVCRT__ */
+
 /*********************************************************************
  *              _waccess (MSVCRT.@)
@@ -318 +356 @@
 }
 
+#ifndef __MINIVCRT__
+
 /*********************************************************************
  *              _chmod (MSVCRT.@)
@@ -339 +379 @@
 }
 
+#endif /* !__MINIVCRT__ */
+
 /*********************************************************************
  *              _wchmod (MSVCRT.@)
@@ -359 +401 @@
   return -1;
 }
+
+#ifndef __MINIVCRT__
 
 /*********************************************************************
@@ -373 +417 @@
 }
 
+#endif /* !__MINIVCRT__ */
+
 /*********************************************************************
  *              _wunlink (MSVCRT.@)
@@ -385 +431 @@
   return -1;
 }
+
+#ifndef __MINIVCRT__
 
 /*********************************************************************
@@ -870 +918 @@
 }
 
+#endif /* !__MINIVCRT__ */
+
 /*********************************************************************
  *              _wmktemp (MSVCRT.@)
@@ -903 +953 @@
   return NULL;
 }
+
+#ifndef __MINIVCRT__
 
 /*********************************************************************
@@ -1310 +1362 @@
 }
 
+#endif /* !__MINIVCRT__ */
+
 /*********************************************************************
  *              _wstat (MSVCRT.@)
@@ -1371 +1425 @@
 }
 
+#ifndef __MINIVCRT__
+
 /*********************************************************************
  *              _tell (MSVCRT.@)
@@ -1396 +1452 @@
 }
 
+#endif /* !__MINIVCRT__ */
+
 /*********************************************************************
  *              _wtempnam (MSVCRT.@)
@@ -1412 +1470 @@
   return NULL;
 }
+
+#ifndef __MINIVCRT__
 
 /*********************************************************************
@@ -2241 +2301 @@
 }
 
+#endif /* !__MINIVCRT__ */
+
 /*********************************************************************
  *              _wremove (MSVCRT.@)
@@ -2254 +2316 @@
 }
 
+#ifndef __MINIVCRT__
+
 /*********************************************************************
  *              scanf (MSVCRT.@)
@@ -2295 +2359 @@
 }
 
+#endif /* !__MINIVCRT__ */
+
 /*********************************************************************
  *              _wrename (MSVCRT.@)
@@ -2307 +2373 @@
   return -1;
 }
+
+#ifndef __MINIVCRT__
 
 /*********************************************************************
@@ -2545 +2613 @@
   return 0;
 }
+
+#endif /* !__MINIVCRT__ */