From 7fcc6f5d67bcf8589b5a5fa612ef71b4afe49b67 Mon Sep 17 00:00:00 2001 From: Robert van Herk Date: Sat, 25 Feb 2012 13:21:32 +0100 Subject: Fix 'T' filemode --- dlls/msvcrt/file.c | 8 +++++++- dlls/msvcrt/tests/file.c | 25 +++++++++++++++++++++++++ 2 files changed, 32 insertions(+), 1 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index c15e33f..2933996 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -1268,10 +1268,16 @@ static int msvcrt_get_flags(const MSVCRT_wchar_t* mode, int *open_flags, int* st *open_flags |= MSVCRT__O_BINARY; *open_flags &= ~MSVCRT__O_TEXT; break; - case 'T': case 't': + case 't': *open_flags |= MSVCRT__O_TEXT; *open_flags &= ~MSVCRT__O_BINARY; break; + case 'D': + FIXME("Implement D flag (temporary file, i.e. delete on close)"); + break; + case 'T': + FIXME("Implement T flag (temporary file, i.e. delete on close, don't flush to disk if possible)"); + break; case '+': case ' ': break; diff --git a/dlls/msvcrt/tests/file.c b/dlls/msvcrt/tests/file.c index b9b904d..81432ec 100644 --- a/dlls/msvcrt/tests/file.c +++ b/dlls/msvcrt/tests/file.c @@ -434,6 +434,30 @@ static void test_asciimode2(void) unlink("ascii2.tst"); } +static void test_filemodeT(void) +{ + char DATA [] = {26, 't', 'e', 's' ,'t'}; + char DATA2 [100]; + char temppath[MAX_PATH]; + char tempfile[MAX_PATH]; + FILE* f; + size_t bytesWritten; + size_t bytesRead; + + GetTempPath (MAX_PATH, temppath); + GetTempFileName (temppath, "", 0, tempfile); + + f = fopen(tempfile, "w+bT"); + bytesWritten = fwrite(DATA, 1, sizeof(DATA), f); + rewind(f); + bytesRead = fread(DATA2, 1, sizeof(DATA2), f); + fclose(f); + + ok (bytesRead == bytesWritten && bytesRead == sizeof(DATA), + "fopen file mode 'T' wrongly interpreted as 't'! Right interpretation is:\n\t'T' -> temporary\n\t't' -> translated.\n" + ); +} + static WCHAR* AtoW( const char* p ) { WCHAR* buffer; @@ -1576,6 +1600,7 @@ START_TEST(file) test_fileops(); test_asciimode(); test_asciimode2(); + test_filemodeT(); test_readmode(FALSE); /* binary mode */ test_readmode(TRUE); /* ascii mode */ test_readboundary(); -- 1.7.4.4