January 2013 - Wine-commits

Piotr Caban : msvcrt: Call _wsopen_s function in _sopen_s.
by Alexandre Julliard 10 Jan '13

10 Jan '13

Module: wine Branch: master Commit: 447f4fa51caa422da103f083f3b4cefa28f838e8 URL: http://source.winehq.org/git/wine.git/?a=commit;h=447f4fa51caa422da103f083f… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jan 10 11:42:43 2013 +0100 msvcrt: Call _wsopen_s function in _sopen_s. --- dlls/msvcrt/file.c | 153 +++++++++++++-------------------------------------- 1 files changed, 39 insertions(+), 114 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 8ee6bed..be3c3d3 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -1758,120 +1758,6 @@ int CDECL MSVCRT__pipe(int *pfds, unsigned int psize, int textmode) return ret; } -/********************************************************************* - * _sopen_s (MSVCRT.@) - */ -int CDECL MSVCRT__sopen_s( int *fd, const char *path, int oflags, int shflags, int pmode ) -{ - DWORD access = 0, creation = 0, attrib; - DWORD sharing; - int wxflag; - HANDLE hand; - SECURITY_ATTRIBUTES sa; - - TRACE("fd*: %p file: (%s) oflags: 0x%04x shflags: 0x%04x pmode: 0x%04x\n", - fd, path, oflags, shflags, pmode); - - if (!MSVCRT_CHECK_PMT( fd != NULL )) return MSVCRT_EINVAL; - - *fd = -1; - wxflag = split_oflags(oflags); - switch (oflags & (MSVCRT__O_RDONLY | MSVCRT__O_WRONLY | MSVCRT__O_RDWR)) - { - case MSVCRT__O_RDONLY: access |= GENERIC_READ; break; - case MSVCRT__O_WRONLY: access |= GENERIC_WRITE; break; - case MSVCRT__O_RDWR: access |= GENERIC_WRITE | GENERIC_READ; break; - } - - if (oflags & MSVCRT__O_CREAT) - { - if(pmode & ~(MSVCRT__S_IREAD | MSVCRT__S_IWRITE)) - FIXME(": pmode 0x%04x ignored\n", pmode); - else - WARN(": pmode 0x%04x ignored\n", pmode); - - if (oflags & MSVCRT__O_EXCL) - creation = CREATE_NEW; - else if (oflags & MSVCRT__O_TRUNC) - creation = CREATE_ALWAYS; - else - creation = OPEN_ALWAYS; - } - else /* no MSVCRT__O_CREAT */ - { - if (oflags & MSVCRT__O_TRUNC) - creation = TRUNCATE_EXISTING; - else - creation = OPEN_EXISTING; - } - - switch( shflags ) - { - case MSVCRT__SH_DENYRW: - sharing = 0L; - break; - case MSVCRT__SH_DENYWR: - sharing = FILE_SHARE_READ; - break; - case MSVCRT__SH_DENYRD: - sharing = FILE_SHARE_WRITE; - break; - case MSVCRT__SH_DENYNO: - sharing = FILE_SHARE_READ | FILE_SHARE_WRITE; - break; - default: - ERR( "Unhandled shflags 0x%x\n", shflags ); - return MSVCRT_EINVAL; - } - attrib = FILE_ATTRIBUTE_NORMAL; - - if (oflags & MSVCRT__O_TEMPORARY) - { - attrib |= FILE_FLAG_DELETE_ON_CLOSE; - access |= DELETE; - sharing |= FILE_SHARE_DELETE; - } - - sa.nLength = sizeof( SECURITY_ATTRIBUTES ); - sa.lpSecurityDescriptor = NULL; - sa.bInheritHandle = !(oflags & MSVCRT__O_NOINHERIT); - - hand = CreateFileA(path, access, sharing, &sa, creation, attrib, 0); - if (hand == INVALID_HANDLE_VALUE) { - WARN(":failed-last error (%d)\n", GetLastError()); - msvcrt_set_errno(GetLastError()); - return *MSVCRT__errno(); - } - - *fd = msvcrt_alloc_fd(hand, wxflag); - - TRACE(":fd (%d) handle (%p)\n", *fd, hand); - return 0; -} - -/********************************************************************* - * _sopen (MSVCRT.@) - */ -int CDECL MSVCRT__sopen( const char *path, int oflags, int shflags, ... ) -{ - int pmode; - int fd; - - if (oflags & MSVCRT__O_CREAT) - { - __ms_va_list ap; - - __ms_va_start(ap, shflags); - pmode = va_arg(ap, int); - __ms_va_end(ap); - } - else - pmode = 0; - - MSVCRT__sopen_s(&fd, path, oflags, shflags, pmode); - return fd; -} - static int check_bom(HANDLE h, int oflags, BOOL seek) { char bom[sizeof(utf8_bom)]; @@ -2074,6 +1960,45 @@ int CDECL MSVCRT__wsopen( const MSVCRT_wchar_t *path, int oflags, int shflags, . } /********************************************************************* + * _sopen_s (MSVCRT.@) + */ +int CDECL MSVCRT__sopen_s( int *fd, const char *path, int oflags, int shflags, int pmode ) +{ + MSVCRT_wchar_t *pathW; + int ret; + + if(!MSVCRT_CHECK_PMT(path && (pathW = msvcrt_wstrdupa(path)))) + return MSVCRT_EINVAL; + + ret = MSVCRT__wsopen_s(fd, pathW, oflags, shflags, pmode); + MSVCRT_free(pathW); + return ret; +} + +/********************************************************************* + * _sopen (MSVCRT.@) + */ +int CDECL MSVCRT__sopen( const char *path, int oflags, int shflags, ... ) +{ + int pmode; + int fd; + + if (oflags & MSVCRT__O_CREAT) + { + __ms_va_list ap; + + __ms_va_start(ap, shflags); + pmode = va_arg(ap, int); + __ms_va_end(ap); + } + else + pmode = 0; + + MSVCRT__sopen_s(&fd, path, oflags, shflags, pmode); + return fd; +} + +/********************************************************************* * _open (MSVCRT.@) */ int CDECL MSVCRT__open( const char *path, int flags, ... )

1 0

Piotr Caban : msvcrt: Added fopen_s test with ccs option.
by Alexandre Julliard 10 Jan '13

10 Jan '13

Module: wine Branch: master Commit: 617bf861efe269d59de172b9bb93eae187dad0f9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=617bf861efe269d59de172b9b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jan 10 11:42:57 2013 +0100 msvcrt: Added fopen_s test with ccs option. --- dlls/msvcrt/tests/file.c | 64 ++++++++++++++++++++++++++++++++++++++++++++++ include/msvcrt/fcntl.h | 3 ++ 2 files changed, 67 insertions(+), 0 deletions(-) diff --git a/dlls/msvcrt/tests/file.c b/dlls/msvcrt/tests/file.c index 0078c2a..3bc754f 100644 --- a/dlls/msvcrt/tests/file.c +++ b/dlls/msvcrt/tests/file.c @@ -1320,6 +1320,7 @@ static void test_fopen_s( void ) { const char name[] = "empty1"; char buff[16]; + unsigned char *ubuff = (unsigned char*)buff; FILE *file; int ret; int len; @@ -1348,6 +1349,69 @@ static void test_fopen_s( void ) ret = fclose(file); ok(ret != EOF, "File failed to close\n"); + ret = p_fopen_s(&file, name, "w, ccs=UNIcode"); + ok(ret == 0, "fopen_s failed with %d\n", ret); + ret = fwrite("a", 1, 2, file); + ok(ret == 2, "fwrite returned %d\n", ret); + fclose(file); + + ret = p_fopen_s(&file, name, "r"); + ok(ret == 0, "fopen_s failed with %d\n", ret); + len = fread(buff, 1, 2, file); + ok(len == 2, "len = %d\n", len); + ok(ubuff[0]==0xff && ubuff[1]==0xfe, "buff[0]=%02x, buff[1]=%02x\n", + ubuff[0], ubuff[1]); + fclose(file); + + ret = p_fopen_s(&file, name, "r,ccs=unicode"); + ok(ret == 0, "fopen_s failed with %d\n", ret); + len = fread(buff, 1, 2, file); + ok(len == 2, "len = %d\n", len); + ok(ubuff[0]=='a' && ubuff[1]==0, "buff[0]=%02x, buff[1]=%02x\n", + ubuff[0], ubuff[1]); + fclose(file); + + ret = p_fopen_s(&file, name, "r,ccs=utf-16le"); + ok(ret == 0, "fopen_s failed with %d\n", ret); + len = fread(buff, 1, 2, file); + ok(len == 2, "len = %d\n", len); + ok(ubuff[0]=='a' && ubuff[1]==0, "buff[0]=%02x, buff[1]=%02x\n", + ubuff[0], ubuff[1]); + fclose(file); + + ret = p_fopen_s(&file, name, "r,ccs=utf-8"); + ok(ret == 0, "fopen_s failed with %d\n", ret); + len = fread(buff, 1, 2, file); + ok(len == 2, "len = %d\n", len); + ok(ubuff[0]=='a' && ubuff[1]==0, "buff[0]=%02x, buff[1]=%02x\n", + ubuff[0], ubuff[1]); + fclose(file); + + ret = p_fopen_s(&file, name, "w,ccs=utf-16le"); + ok(ret == 0, "fopen_s failed with %d\n", ret); + fclose(file); + + ret = p_fopen_s(&file, name, "r"); + ok(ret == 0, "fopen_s failed with %d\n", ret); + len = fread(buff, 1, 3, file); + ok(len == 2, "len = %d\n", len); + ok(ubuff[0]==0xff && ubuff[1]==0xfe, "buff[0]=%02x, buff[1]=%02x\n", + ubuff[0], ubuff[1]); + fclose(file); + + ret = p_fopen_s(&file, name, "w,ccs=utf-8"); + ok(ret == 0, "fopen_s failed with %d\n", ret); + fclose(file); + + ret = p_fopen_s(&file, name, "r"); + ok(ret == 0, "fopen_s failed with %d\n", ret); + len = fread(buff, 1, 4, file); + ok(len == 3, "len = %d\n", len); + ok(ubuff[0]==0xef && ubuff[1]==0xbb && ubuff[2]==0xbf, + "buff[0]=%02x, buff[1]=%02x, buff[2]=%02x\n", + ubuff[0], ubuff[1], ubuff[2]); + fclose(file); + ok(_unlink(name) == 0, "Couldn't unlink file named '%s'\n", name); } diff --git a/include/msvcrt/fcntl.h b/include/msvcrt/fcntl.h index d0ee97b..267feed 100644 --- a/include/msvcrt/fcntl.h +++ b/include/msvcrt/fcntl.h @@ -27,6 +27,9 @@ #define _O_BINARY 0x8000 #define _O_RAW _O_BINARY +#define _O_WTEXT 0x10000 +#define _O_U16TEXT 0x20000 +#define _O_U8TEXT 0x40000 #define O_RDONLY _O_RDONLY #define O_WRONLY _O_WRONLY

1 0

Piotr Caban : msvcrt: Added support for unicode mode in write function.
by Alexandre Julliard 10 Jan '13

10 Jan '13

Module: wine Branch: master Commit: 94e3647533cf503bc0d716ab9586c0d583c45c9a URL: http://source.winehq.org/git/wine.git/?a=commit;h=94e3647533cf503bc0d716ab9… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jan 10 11:43:11 2013 +0100 msvcrt: Added support for unicode mode in write function. --- dlls/msvcrt/file.c | 227 +++++++++++++++++++++++++++++++++++----------------- 1 files changed, 154 insertions(+), 73 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index be3c3d3..90330f1 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -2586,89 +2586,170 @@ int CDECL _wutime(const MSVCRT_wchar_t* path, struct MSVCRT___utimbuf32 *t) */ int CDECL MSVCRT__write(int fd, const void* buf, unsigned int count) { - DWORD num_written; - HANDLE hand = msvcrt_fdtoh(fd); + DWORD num_written; + ioinfo *info = msvcrt_get_ioinfo(fd); + HANDLE hand = info->handle; - /* Don't trace small writes, it gets *very* annoying */ + /* Don't trace small writes, it gets *very* annoying */ #if 0 - if (count > 32) - TRACE(":fd (%d) handle (%d) buf (%p) len (%d)\n",fd,hand,buf,count); + if (count > 32) + TRACE(":fd (%d) handle (%d) buf (%p) len (%d)\n",fd,hand,buf,count); #endif - if (hand == INVALID_HANDLE_VALUE) + if (hand == INVALID_HANDLE_VALUE) { - *MSVCRT__errno() = MSVCRT_EBADF; - return -1; + *MSVCRT__errno() = MSVCRT_EBADF; + return -1; + } + + if (((info->exflag&EF_UTF8) || (info->exflag&EF_UTF16)) && count&1) + { + *MSVCRT__errno() = MSVCRT_EINVAL; + return -1; } - /* If appending, go to EOF */ - if (msvcrt_get_ioinfo(fd)->wxflag & WX_APPEND) - MSVCRT__lseek(fd, 0, FILE_END); + /* If appending, go to EOF */ + if (info->wxflag & WX_APPEND) + MSVCRT__lseek(fd, 0, FILE_END); - if (!(msvcrt_get_ioinfo(fd)->wxflag & WX_TEXT)) + if (!(info->wxflag & WX_TEXT)) { - if (WriteFile(hand, buf, count, &num_written, NULL) - && (num_written == count)) - return num_written; - TRACE("WriteFile (fd %d, hand %p) failed-last error (%d)\n", fd, - hand, GetLastError()); - *MSVCRT__errno() = MSVCRT_ENOSPC; + if (WriteFile(hand, buf, count, &num_written, NULL) + && (num_written == count)) + return num_written; + TRACE("WriteFile (fd %d, hand %p) failed-last error (%d)\n", fd, + hand, GetLastError()); + *MSVCRT__errno() = MSVCRT_ENOSPC; } - else - { - unsigned int i, j, nr_lf; - char *p = NULL; - const char *q; - const char *s = buf, *buf_start = buf; - /* find number of \n ( without preceding \r ) */ - for ( nr_lf=0,i = 0; i <count; i++) - { - if (s[i]== '\n') - { - nr_lf++; - /*if ((i >1) && (s[i-1] == '\r')) nr_lf--; */ - } - } - if (nr_lf) - { - if ((q = p = MSVCRT_malloc(count + nr_lf))) - { - for (s = buf, i = 0, j = 0; i < count; i++) - { - if (s[i]== '\n') - { - p[j++] = '\r'; - /*if ((i >1) && (s[i-1] == '\r'))j--;*/ - } - p[j++] = s[i]; - } - } - else - { - FIXME("Malloc failed\n"); - nr_lf =0; - q = buf; - } - } - else - q = buf; + else + { + unsigned int i, j, nr_lf, size; + char *p = NULL; + const char *q; + const char *s = buf, *buf_start = buf; - if ((WriteFile(hand, q, count+nr_lf, &num_written, NULL) == 0 ) || (num_written != count+nr_lf)) - { - TRACE("WriteFile (fd %d, hand %p) failed-last error (%d), num_written %d\n", - fd, hand, GetLastError(), num_written); - *MSVCRT__errno() = MSVCRT_ENOSPC; - if(nr_lf) - MSVCRT_free(p); - return s - buf_start; - } - else - { - if(nr_lf) - MSVCRT_free(p); - return count; - } - } - return -1; + if (!(info->exflag & (EF_UTF8|EF_UTF16))) + { + /* find number of \n */ + for (nr_lf=0, i=0; i<count; i++) + if (s[i] == '\n') + nr_lf++; + if (nr_lf) + { + size = count+nr_lf; + if ((q = p = MSVCRT_malloc(size))) + { + for (s = buf, i = 0, j = 0; i < count; i++) + { + if (s[i] == '\n') + p[j++] = '\r'; + p[j++] = s[i]; + } + } + else + { + FIXME("Malloc failed\n"); + nr_lf = 0; + size = count; + q = buf; + } + } + else + { + size = count; + q = buf; + } + } + else if (info->exflag & EF_UTF16) + { + for (nr_lf=0, i=0; i<count; i+=2) + if (s[i]=='\n' && s[i+1]==0) + nr_lf += 2; + if (nr_lf) + { + size = count+nr_lf; + if ((q = p = MSVCRT_malloc(size))) + { + for (s=buf, i=0, j=0; i<count; i++) + { + if (s[i]=='\n' && s[i+1]==0) + { + p[j++] = '\r'; + p[j++] = 0; + } + p[j++] = s[i++]; + p[j++] = s[i]; + } + } + else + { + FIXME("Malloc failed\n"); + nr_lf = 0; + size = count; + q = buf; + } + } + else + { + size = count; + q = buf; + } + } + else + { + DWORD conv_len; + + for(nr_lf=0, i=0; i<count; i+=2) + if (s[i]=='\n' && s[i+1]==0) + nr_lf++; + + conv_len = WideCharToMultiByte(CP_UTF8, 0, (WCHAR*)buf, count/2, NULL, 0, NULL, NULL); + if(!conv_len) { + msvcrt_set_errno(GetLastError()); + MSVCRT_free(p); + return -1; + } + + size = conv_len+nr_lf; + if((p = MSVCRT_malloc(count+nr_lf*2+size))) + { + for (s=buf, i=0, j=0; i<count; i++) + { + if (s[i]=='\n' && s[i+1]==0) + { + p[j++] = '\r'; + p[j++] = 0; + } + p[j++] = s[i++]; + p[j++] = s[i]; + } + q = p+count+nr_lf*2; + WideCharToMultiByte(CP_UTF8, 0, (WCHAR*)p, count/2+nr_lf, + p+count+nr_lf*2, conv_len+nr_lf, NULL, NULL); + } + else + { + FIXME("Malloc failed\n"); + nr_lf = 0; + size = count; + q = buf; + } + } + + if (!WriteFile(hand, q, size, &num_written, NULL)) + num_written = -1; + if(p) + MSVCRT_free(p); + if (num_written != size) + { + TRACE("WriteFile (fd %d, hand %p) failed-last error (%d), num_written %d\n", + fd, hand, GetLastError(), num_written); + *MSVCRT__errno() = MSVCRT_ENOSPC; + return s - buf_start; + } + return count; + } + + return -1; } /*********************************************************************

1 0

Piotr Caban : msvcrt: Added write tests on unicode files.
by Alexandre Julliard 10 Jan '13

10 Jan '13

Module: wine Branch: master Commit: 5778bdbc3a8ba3aafab4605ccf355369189ef79c URL: http://source.winehq.org/git/wine.git/?a=commit;h=5778bdbc3a8ba3aafab4605cc… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jan 10 11:43:25 2013 +0100 msvcrt: Added write tests on unicode files. --- dlls/msvcrt/tests/file.c | 42 +++++++++++++++++++++++++++++++++++++++++- 1 files changed, 41 insertions(+), 1 deletions(-) diff --git a/dlls/msvcrt/tests/file.c b/dlls/msvcrt/tests/file.c index 3bc754f..260ff18 100644 --- a/dlls/msvcrt/tests/file.c +++ b/dlls/msvcrt/tests/file.c @@ -975,7 +975,7 @@ static void test_file_write_read( void ) free(tempf); tempf=_tempnam(".","wne"); - tempfd = _open(tempf,_O_CREAT|_O_TRUNC|_O_BINARY|_O_RDWR,0); + tempfd = _open(tempf, _O_CREAT|_O_TRUNC|_O_BINARY|_O_RDWR, _S_IWRITE); ok( tempfd != -1, "Can't open '%s': %d\n", tempf, errno); /* open in BINARY mode */ ok(_write(tempfd,dostext,strlen(dostext)) == lstrlenA(dostext), @@ -1011,6 +1011,46 @@ static void test_file_write_read( void ) ok(i == strlen(mytext)-1, "_read_i %d\n", i); _close(tempfd); + /* test read/write in unicode mode */ + if(p_fopen_s) + { + tempfd = _open(tempf, _O_CREAT|_O_TRUNC|_O_WRONLY|_O_WTEXT, _S_IWRITE); + ok(tempfd != -1, "_open failed with error: %d\n", errno); + ret = _write(tempfd, "a", 1); + ok(ret == -1, "_write returned %d, expected -1\n", ret); + ret = _write(tempfd, "a\x00\n\x00\xff\xff", 6); + ok(ret == 6, "_write returned %d, expected 6\n", ret); + _close(tempfd); + + tempfd = _open(tempf, _O_RDONLY|_O_BINARY, 0); + ok(tempfd != -1, "_open failed with error: %d\n", errno); + ret = _read(tempfd, btext, sizeof(btext)); + ok(ret == 10, "_read returned %d, expected 10\n", ret); + ok(!memcmp(btext, "\xff\xfe\x61\x00\r\x00\n\x00\xff\xff", 10), "btext is incorrect\n"); + _close(tempfd); + + tempfd = _open(tempf, _O_CREAT|_O_TRUNC|_O_WRONLY|_O_U8TEXT, _S_IWRITE); + ok(tempfd != -1, "_open failed with error: %d\n", errno); + errno = 0xdeadbeef; + ret = _write(tempfd, "a", 1); + ok(ret == -1, "_write returned %d, expected -1\n", ret); + ok(errno == 22, "errno = %d\n", errno); + ret = _write(tempfd, "a\x00\n\x00\x62\x00", 6); + ok(ret == 6, "_write returned %d, expected 6\n", ret); + _close(tempfd); + + tempfd = _open(tempf, _O_RDONLY|_O_BINARY, 0); + ok(tempfd != -1, "_open failed with error: %d\n", errno); + ret = _read(tempfd, btext, sizeof(btext)); + ok(ret == 7, "_read returned %d, expected 7\n", ret); + ok(!memcmp(btext, "\xef\xbb\xbf\x61\r\n\x62", 7), "btext is incorrect\n"); + _close(tempfd); + } + else + { + win_skip("unicode mode tests on file\n"); + } + ret =_chmod (tempf, _S_IREAD | _S_IWRITE); ok( ret == 0, "Can't chmod '%s' to read-write: %d\n", tempf, errno);

1 0

Piotr Caban : msvcrt: Fixed handling of '\r' when it' s the last character in the buffer in read.
by Alexandre Julliard 10 Jan '13

10 Jan '13

Module: wine Branch: master Commit: 6e011b8310ae88fa591f78c0b77e02557e1448c0 URL: http://source.winehq.org/git/wine.git/?a=commit;h=6e011b8310ae88fa591f78c0b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jan 10 11:43:37 2013 +0100 msvcrt: Fixed handling of '\r' when it's the last character in the buffer in read. --- dlls/msvcrt/file.c | 117 ++++++++++++++++++++++++++++++++++----------------- 1 files changed, 78 insertions(+), 39 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 90330f1..feabbca 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -60,8 +60,8 @@ WINE_DEFAULT_DEBUG_CHANNEL(msvcrt); /* values for wxflag in file descriptor */ #define WX_OPEN 0x01 #define WX_ATEOF 0x02 -#define WX_READEOF 0x04 /* like ATEOF, but for underlying file rather than buffer */ -#define WX_READCR 0x08 /* underlying file is at \r */ +#define WX_READCR 0x04 /* underlying file is at \r */ +#define WX_PIPE 0x08 #define WX_DONTINHERIT 0x10 #define WX_APPEND 0x20 #define WX_TEXT 0x80 @@ -83,7 +83,7 @@ static char utf16_bom[2] = { 0xff, 0xfe }; typedef struct { HANDLE handle; unsigned char wxflag; - char unk1; + char lookahead[3]; int exflag; CRITICAL_SECTION crit; } ioinfo; @@ -319,7 +319,10 @@ static int msvcrt_alloc_fd_from(HANDLE hand, int flag, int fd) } fdinfo->handle = hand; - fdinfo->wxflag = WX_OPEN | (flag & (WX_DONTINHERIT | WX_APPEND | WX_TEXT)); + fdinfo->wxflag = WX_OPEN | (flag & (WX_DONTINHERIT | WX_APPEND | WX_TEXT | WX_PIPE)); + fdinfo->lookahead[0] = '\n'; + fdinfo->lookahead[1] = '\n'; + fdinfo->lookahead[2] = '\n'; fdinfo->exflag = 0; /* locate next free slot */ @@ -494,6 +497,9 @@ void msvcrt_init_io(void) GetCurrentProcess(), &fdinfo->handle, 0, TRUE, DUPLICATE_SAME_ACCESS)) fdinfo->wxflag = WX_OPEN | WX_TEXT; + fdinfo->lookahead[0] = '\n'; + fdinfo->lookahead[1] = '\n'; + fdinfo->lookahead[2] = '\n'; fdinfo->exflag = 0; } @@ -505,6 +511,9 @@ void msvcrt_init_io(void) GetCurrentProcess(), &fdinfo->handle, 0, TRUE, DUPLICATE_SAME_ACCESS)) fdinfo->wxflag = WX_OPEN | WX_TEXT; + fdinfo->lookahead[0] = '\n'; + fdinfo->lookahead[1] = '\n'; + fdinfo->lookahead[2] = '\n'; fdinfo->exflag = 0; } @@ -516,6 +525,9 @@ void msvcrt_init_io(void) GetCurrentProcess(), &fdinfo->handle, 0, TRUE, DUPLICATE_SAME_ACCESS)) fdinfo->wxflag = WX_OPEN | WX_TEXT; + fdinfo->lookahead[0] = '\n'; + fdinfo->lookahead[1] = '\n'; + fdinfo->lookahead[2] = '\n'; fdinfo->exflag = 0; } @@ -1050,7 +1062,7 @@ __int64 CDECL MSVCRT__lseeki64(int fd, __int64 offset, int whence) if ((ofs.u.LowPart = SetFilePointer(hand, ofs.u.LowPart, &ofs.u.HighPart, whence)) != INVALID_SET_FILE_POINTER || GetLastError() == ERROR_SUCCESS) { - msvcrt_get_ioinfo(fd)->wxflag &= ~(WX_ATEOF|WX_READEOF); + msvcrt_get_ioinfo(fd)->wxflag &= ~WX_ATEOF; /* FIXME: What if we seek _to_ EOF - is EOF set? */ return ofs.QuadPart; @@ -1727,11 +1739,11 @@ int CDECL MSVCRT__pipe(int *pfds, unsigned int psize, int textmode) int fd; LOCK_FILES(); - fd = msvcrt_alloc_fd(readHandle, wxflags); + fd = msvcrt_alloc_fd(readHandle, wxflags|WX_PIPE); if (fd != -1) { pfds[0] = fd; - fd = msvcrt_alloc_fd(writeHandle, wxflags); + fd = msvcrt_alloc_fd(writeHandle, wxflags|WX_PIPE); if (fd != -1) { pfds[1] = fd; @@ -2109,33 +2121,40 @@ int CDECL MSVCRT__rmtmp(void) */ static int read_i(int fd, void *buf, unsigned int count) { - DWORD num_read; - char *bufstart = buf; - HANDLE hand = msvcrt_fdtoh(fd); - ioinfo *fdinfo = msvcrt_get_ioinfo(fd); + DWORD num_read; + char *bufstart = buf; + HANDLE hand = msvcrt_fdtoh(fd); + ioinfo *fdinfo = msvcrt_get_ioinfo(fd); - if (count == 0) - return 0; + if (count == 0) + return 0; - if (fdinfo->wxflag & WX_READEOF) { - fdinfo->wxflag |= WX_ATEOF; - TRACE("already at EOF, returning 0\n"); - return 0; - } - /* Don't trace small reads, it gets *very* annoying */ - if (count > 4) - TRACE(":fd (%d) handle (%p) buf (%p) len (%d)\n",fd,hand,buf,count); - if (hand == INVALID_HANDLE_VALUE) - return -1; + if (fdinfo->wxflag & WX_ATEOF) { + TRACE("already at EOF, returning 0\n"); + return 0; + } + /* Don't trace small reads, it gets *very* annoying */ + if (count > 4) + TRACE(":fd (%d) handle (%p) buf (%p) len (%d)\n",fd,hand,buf,count); + if (hand == INVALID_HANDLE_VALUE) + return -1; - /* Reading single bytes in O_TEXT mode makes things slow - * So read big chunks - */ - if (ReadFile(hand, bufstart, count, &num_read, NULL)) + if (fdinfo->lookahead[0]!='\n' || ReadFile(hand, bufstart, count, &num_read, NULL)) { + if (fdinfo->lookahead[0] != '\n') + { + bufstart[0] = fdinfo->lookahead[0]; + fdinfo->lookahead[0] = '\n'; + + if(count>1 && ReadFile(hand, bufstart+1, count-1, &num_read, NULL)) + num_read++; + else + num_read = 1; + } + if (count != 0 && num_read == 0) { - fdinfo->wxflag |= (WX_ATEOF|WX_READEOF); + fdinfo->wxflag |= WX_ATEOF; TRACE(":EOF %s\n",debugstr_an(buf,num_read)); } else if (fdinfo->wxflag & WX_TEXT) @@ -2161,16 +2180,36 @@ static int read_i(int fd, void *buf, unsigned int count) /* in text mode, a ctrl-z signals EOF */ if (bufstart[i] == 0x1a) { - fdinfo->wxflag |= (WX_ATEOF|WX_READEOF); + fdinfo->wxflag |= WX_ATEOF; TRACE(":^Z EOF %s\n",debugstr_an(buf,num_read)); break; } - /* in text mode, strip \r if followed by \n. - * BUG: should save state across calls somehow, so CR LF that - * straddles buffer boundary gets recognized properly? - */ - if ((bufstart[i] != '\r') - || ((i+1) < num_read && bufstart[i+1] != '\n')) + + /* in text mode, strip \r if followed by \n */ + if (bufstart[i]=='\r' && i+1==num_read) + { + char lookahead; + DWORD len; + + if (ReadFile(hand, &lookahead, 1, &len, NULL) && len) + { + if(lookahead=='\n' && j==0) + bufstart[j++] = '\n'; + else + { + if(lookahead != '\n') + bufstart[j++] = '\r'; + + if (fdinfo->wxflag & WX_PIPE) + fdinfo->lookahead[0] = lookahead; + else + SetFilePointer(fdinfo->handle, -1, NULL, FILE_CURRENT); + } + } + else + bufstart[j++] = '\r'; + } + else if(bufstart[i]!='\r' || bufstart[i+1]!='\n') bufstart[j++] = bufstart[i]; } num_read = j; @@ -2181,7 +2220,7 @@ static int read_i(int fd, void *buf, unsigned int count) if (GetLastError() == ERROR_BROKEN_PIPE) { TRACE(":end-of-pipe\n"); - fdinfo->wxflag |= (WX_ATEOF|WX_READEOF); + fdinfo->wxflag |= WX_ATEOF; return 0; } else @@ -2191,9 +2230,9 @@ static int read_i(int fd, void *buf, unsigned int count) } } - if (count > 4) - TRACE("(%u), %s\n",num_read,debugstr_an(buf, num_read)); - return num_read; + if (count > 4) + TRACE("(%u), %s\n",num_read,debugstr_an(buf, num_read)); + return num_read; } /*********************************************************************

1 0

Piotr Caban : msvcrt: Call ftell function in fgetpos.
by Alexandre Julliard 10 Jan '13

10 Jan '13

Module: wine Branch: master Commit: 568a3be86938d850a8aaa05220feeb39d8a154f1 URL: http://source.winehq.org/git/wine.git/?a=commit;h=568a3be86938d850a8aaa0522… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jan 10 11:43:49 2013 +0100 msvcrt: Call ftell function in fgetpos. --- dlls/msvcrt/file.c | 29 ++--------------------------- 1 files changed, 2 insertions(+), 27 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index feabbca..8b5ec29 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -3591,34 +3591,9 @@ LONG CDECL MSVCRT_ftell(MSVCRT_FILE* file) */ int CDECL MSVCRT_fgetpos(MSVCRT_FILE* file, MSVCRT_fpos_t *pos) { - int off=0; - - MSVCRT__lock_file(file); - *pos = MSVCRT__lseeki64(file->_file,0,SEEK_CUR); - if(*pos == -1) { - MSVCRT__unlock_file(file); + *pos = MSVCRT__ftelli64(file); + if(*pos == -1) return -1; - } - if(file->_bufsiz) { - if( file->_flag & MSVCRT__IOWRT ) { - off = file->_ptr - file->_base; - } else { - off = -file->_cnt; - if (msvcrt_get_ioinfo(file->_file)->wxflag & WX_TEXT) { - /* Black magic correction for CR removal */ - int i; - for (i=0; i<file->_cnt; i++) { - if (file->_ptr[i] == '\n') - off--; - } - /* Black magic when reading CR at buffer boundary*/ - if(msvcrt_get_ioinfo(file->_file)->wxflag & WX_READCR) - off--; - } - } - } - *pos += off; - MSVCRT__unlock_file(file); return 0; }

1 0

Piotr Caban : msvcrt: Simplify fseek implementation.
by Alexandre Julliard 10 Jan '13

10 Jan '13

Module: wine Branch: master Commit: 4ffa9364eba5d4c2a5b00d6df647ac0cfb6db3ec URL: http://source.winehq.org/git/wine.git/?a=commit;h=4ffa9364eba5d4c2a5b00d6df… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jan 10 11:44:02 2013 +0100 msvcrt: Simplify fseek implementation. --- dlls/msvcrt/file.c | 15 +++------------ dlls/msvcrt/msvcrt.h | 1 + 2 files changed, 4 insertions(+), 12 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 8b5ec29..e19e81e 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -1169,19 +1169,10 @@ int CDECL MSVCRT__fseeki64(MSVCRT_FILE* file, __int64 offset, int whence) msvcrt_flush_buffer(file); if(whence == SEEK_CUR && file->_flag & MSVCRT__IOREAD ) { - offset -= file->_cnt; - if (msvcrt_get_ioinfo(file->_file)->wxflag & WX_TEXT) { - /* Black magic correction for CR removal */ - int i; - for (i=0; i<file->_cnt; i++) { - if (file->_ptr[i] == '\n') - offset--; - } - /* Black magic when reading CR at buffer boundary*/ - if(msvcrt_get_ioinfo(file->_file)->wxflag & WX_READCR) - offset--; - } + whence = SEEK_SET; + offset += MSVCRT__ftelli64(file); } + /* Discard buffered input */ file->_cnt = 0; file->_ptr = file->_base; diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h index 30779bc..1bdf393 100644 --- a/dlls/msvcrt/msvcrt.h +++ b/dlls/msvcrt/msvcrt.h @@ -885,6 +885,7 @@ int __cdecl MSVCRT_fgetc(MSVCRT_FILE*); int __cdecl MSVCRT_ungetc(int,MSVCRT_FILE*); MSVCRT_wint_t __cdecl MSVCRT_fgetwc(MSVCRT_FILE*); MSVCRT_wint_t __cdecl MSVCRT_ungetwc(MSVCRT_wint_t,MSVCRT_FILE*); +__int64 __cdecl MSVCRT__ftelli64(MSVCRT_FILE* file); void __cdecl MSVCRT__exit(int); void __cdecl MSVCRT_abort(void); MSVCRT_ulong* __cdecl MSVCRT___doserrno(void);

1 0

Piotr Caban : msvcrt: Improved ftell implementation.
by Alexandre Julliard 10 Jan '13

10 Jan '13

Module: wine Branch: master Commit: eeb7d0a649ec28f89ed137d514ee57705ee5045e URL: http://source.winehq.org/git/wine.git/?a=commit;h=eeb7d0a649ec28f89ed137d51… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jan 10 11:44:18 2013 +0100 msvcrt: Improved ftell implementation. --- dlls/msvcrt/file.c | 69 ++++++++++++++++++++++++++++------------------------ 1 files changed, 37 insertions(+), 32 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index e19e81e..0b028bd 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -60,7 +60,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(msvcrt); /* values for wxflag in file descriptor */ #define WX_OPEN 0x01 #define WX_ATEOF 0x02 -#define WX_READCR 0x04 /* underlying file is at \r */ +#define WX_READNL 0x04 /* read started with \n */ #define WX_PIPE 0x08 #define WX_DONTINHERIT 0x10 #define WX_APPEND 0x20 @@ -2151,21 +2151,12 @@ static int read_i(int fd, void *buf, unsigned int count) else if (fdinfo->wxflag & WX_TEXT) { DWORD i, j; - if (bufstart[num_read-1] == '\r') - { - if(count == 1) - { - fdinfo->wxflag &= ~WX_READCR; - ReadFile(hand, bufstart, 1, &num_read, NULL); - } - else - { - fdinfo->wxflag |= WX_READCR; - num_read--; - } - } - else - fdinfo->wxflag &= ~WX_READCR; + + if (bufstart[0] == '\n') + fdinfo->wxflag |= WX_READNL; + else + fdinfo->wxflag &= ~WX_READNL; + for (i=0, j=0; i<num_read; i++) { /* in text mode, a ctrl-z signals EOF */ @@ -3536,8 +3527,6 @@ int CDECL MSVCRT_fsetpos(MSVCRT_FILE* file, MSVCRT_fpos_t *pos) */ __int64 CDECL MSVCRT__ftelli64(MSVCRT_FILE* file) { - /* TODO: just call fgetpos and return lower half of result */ - int off=0; __int64 pos; MSVCRT__lock_file(file); @@ -3547,26 +3536,42 @@ __int64 CDECL MSVCRT__ftelli64(MSVCRT_FILE* file) return -1; } if(file->_bufsiz) { - if( file->_flag & MSVCRT__IOWRT ) { - off = file->_ptr - file->_base; + if(file->_flag & MSVCRT__IOWRT) { + pos += file->_ptr - file->_base; + } else if(!file->_cnt) { /* nothing to do */ + } else if(MSVCRT__lseeki64(file->_file, 0, SEEK_END)==pos) { + int i; + + pos -= file->_cnt; + if(msvcrt_get_ioinfo(file->_file)->wxflag & WX_TEXT) { + for(i=0; i<file->_cnt; i++) + if(file->_ptr[i] == '\n') + pos--; + } } else { - off = -file->_cnt; - if (msvcrt_get_ioinfo(file->_file)->wxflag & WX_TEXT) { - /* Black magic correction for CR removal */ - int i; - for (i=0; i<file->_cnt; i++) { - if (file->_ptr[i] == '\n') - off--; - } - /* Black magic when reading CR at buffer boundary*/ - if(msvcrt_get_ioinfo(file->_file)->wxflag & WX_READCR) - off--; + char *p; + + if(MSVCRT__lseeki64(file->_file, pos, SEEK_SET) != pos) { + MSVCRT__unlock_file(file); + return -1; + } + + pos -= file->_bufsiz; + pos += file->_ptr - file->_base; + + if(msvcrt_get_ioinfo(file->_file)->wxflag & WX_TEXT) { + if(msvcrt_get_ioinfo(file->_file)->wxflag & WX_READNL) + pos--; + + for(p=file->_base; p<file->_ptr; p++) + if(*p == '\n') + pos++; } } } MSVCRT__unlock_file(file); - return off + pos; + return pos; } /*********************************************************************

1 0

Piotr Caban : msvcrt: Added unicode modes support _setmode function.
by Alexandre Julliard 10 Jan '13

10 Jan '13

Module: wine Branch: master Commit: a0ef884542eee3e1dbbe11de31a21556af39a21b URL: http://source.winehq.org/git/wine.git/?a=commit;h=a0ef884542eee3e1dbbe11de3… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jan 10 11:44:48 2013 +0100 msvcrt: Added unicode modes support _setmode function. --- dlls/msvcrt/file.c | 31 ++++++++++++++++++++++++------- 1 files changed, 24 insertions(+), 7 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 0b028bd..0818f8e 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -2232,14 +2232,31 @@ int CDECL MSVCRT__read(int fd, void *buf, unsigned int count) */ int CDECL MSVCRT__setmode(int fd,int mode) { - int ret = msvcrt_get_ioinfo(fd)->wxflag & WX_TEXT ? MSVCRT__O_TEXT : MSVCRT__O_BINARY; - if (mode & (~(MSVCRT__O_TEXT|MSVCRT__O_BINARY))) - FIXME("fd (%d) mode (0x%08x) unknown\n",fd,mode); - if ((mode & MSVCRT__O_TEXT) == MSVCRT__O_TEXT) + int ret = msvcrt_get_ioinfo(fd)->wxflag & WX_TEXT ? MSVCRT__O_TEXT : MSVCRT__O_BINARY; + if(ret==MSVCRT__O_TEXT && (msvcrt_get_ioinfo(fd)->exflag & (EF_UTF8|EF_UTF16))) + ret = MSVCRT__O_WTEXT; + + if(mode!=MSVCRT__O_TEXT && mode!=MSVCRT__O_BINARY && mode!=MSVCRT__O_WTEXT + && mode!=MSVCRT__O_U16TEXT && mode!=MSVCRT__O_U8TEXT) { + *MSVCRT__errno() = MSVCRT_EINVAL; + return -1; + } + + if(mode == MSVCRT__O_BINARY) { + msvcrt_get_ioinfo(fd)->wxflag &= ~WX_TEXT; + msvcrt_get_ioinfo(fd)->exflag &= ~(EF_UTF8|EF_UTF16); + return ret; + } + msvcrt_get_ioinfo(fd)->wxflag |= WX_TEXT; - else - msvcrt_get_ioinfo(fd)->wxflag &= ~WX_TEXT; - return ret; + if(mode == MSVCRT__O_TEXT) + msvcrt_get_ioinfo(fd)->exflag &= ~(EF_UTF8|EF_UTF16); + else if(mode == MSVCRT__O_U8TEXT) + msvcrt_get_ioinfo(fd)->exflag = (msvcrt_get_ioinfo(fd)->exflag & ~EF_UTF16) | EF_UTF8; + else + msvcrt_get_ioinfo(fd)->exflag = (msvcrt_get_ioinfo(fd)->exflag & ~EF_UTF8) | EF_UTF16; + + return ret; } /*********************************************************************

1 0

Piotr Caban : msvcrt: Added _setmode tests.
by Alexandre Julliard 10 Jan '13

10 Jan '13

Module: wine Branch: master Commit: f93259b3053d39b84d9377e89e41c98503fa1c00 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f93259b3053d39b84d9377e89… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jan 10 11:45:05 2013 +0100 msvcrt: Added _setmode tests. --- dlls/msvcrt/tests/file.c | 56 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 56 insertions(+), 0 deletions(-) diff --git a/dlls/msvcrt/tests/file.c b/dlls/msvcrt/tests/file.c index 260ff18..7928b9e 100644 --- a/dlls/msvcrt/tests/file.c +++ b/dlls/msvcrt/tests/file.c @@ -1496,6 +1496,61 @@ static void test__wfopen_s( void ) ok(_unlink(name) == 0, "Couldn't unlink file named '%s'\n", name); } +static void test_setmode(void) +{ + const char name[] = "empty1"; + int fd, ret; + + if(!p_fopen_s) { + win_skip("unicode file modes are not available, skipping setmode tests\n"); + return; + } + + fd = _open(name, _O_CREAT|_O_WRONLY, _S_IWRITE); + ok(fd != -1, "failed to open file\n"); + + errno = 0xdeadbeef; + ret = _setmode(fd, 0xffffffff); + ok(ret == -1, "_setmode returned %x, expected -1\n", ret); + ok(errno == EINVAL, "errno = %d\n", errno); + + errno = 0xdeadbeef; + ret = _setmode(fd, 0); + ok(ret == -1, "_setmode returned %x, expected -1\n", ret); + ok(errno == EINVAL, "errno = %d\n", errno); + + errno = 0xdeadbeef; + ret = _setmode(fd, _O_BINARY|_O_TEXT); + ok(ret == -1, "_setmode returned %x, expected -1\n", ret); + ok(errno == EINVAL, "errno = %d\n", errno); + + errno = 0xdeadbeef; + ret = _setmode(fd, _O_WTEXT|_O_U16TEXT); + ok(ret == -1, "_setmode returned %x, expected -1\n", ret); + ok(errno == EINVAL, "errno = %d\n", errno); + + ret = _setmode(fd, _O_BINARY); + ok(ret == _O_TEXT, "_setmode returned %x, expected _O_TEXT\n", ret); + + ret = _setmode(fd, _O_WTEXT); + ok(ret == _O_BINARY, "_setmode returned %x, expected _O_BINARY\n", ret); + + ret = _setmode(fd, _O_TEXT); + ok(ret == _O_WTEXT, "_setmode returned %x, expected _O_WTEXT\n", ret); + + ret = _setmode(fd, _O_U16TEXT); + ok(ret == _O_TEXT, "_setmode returned %x, expected _O_TEXT\n", ret); + + ret = _setmode(fd, _O_U8TEXT); + ok(ret == _O_WTEXT, "_setmode returned %x, expected _O_WTEXT\n", ret); + + ret = _setmode(fd, _O_TEXT); + ok(ret == _O_WTEXT, "_setmode returned %x, expected _O_WTEXT\n", ret); + + _close(fd); + _unlink(name); +} + static void test_get_osfhandle(void) { int fd; @@ -1784,6 +1839,7 @@ START_TEST(file) test_fopen_fclose_fcloseall(); test_fopen_s(); test__wfopen_s(); + test_setmode(); test_fileops(); test_asciimode(); test_asciimode2();

1 0