January 2013 - Wine-commits

Austin English : wine.inf: Add HKLM, System\CurrentControlSet\Control\TimeZoneInformation\{StandardName, TimeZoneKeyName} registry keys.
by Alexandre Julliard 10 Jan '13

10 Jan '13

Module: wine Branch: master Commit: 0546c551f17fda52e4d60dbb1a8af3535fa68212 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0546c551f17fda52e4d60dbb1… Author: Austin English <austinenglish(a)gmail.com> Date: Tue Jan 8 20:33:33 2013 -0800 wine.inf: Add HKLM, System\CurrentControlSet\Control\TimeZoneInformation\{StandardName, TimeZoneKeyName} registry keys. --- tools/wine.inf.in | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/tools/wine.inf.in b/tools/wine.inf.in index 9d0650f..e7cc5c7 100644 --- a/tools/wine.inf.in +++ b/tools/wine.inf.in @@ -639,6 +639,8 @@ HKLM,Software\Microsoft\Transaction Server,,16 HKLM,Software\Policies,,16 HKLM,Software\Registered Applications,,16 HKLM,System\CurrentControlSet\Control\Lsa,,16 +HKLM,System\CurrentControlSet\Control\TimeZoneInformation,"StandardName",2,"" +HKLM,System\CurrentControlSet\Control\TimeZoneInformation,"TimeZoneKeyName",2,"" HKLM,System\CurrentControlSet\Control\VirtualDeviceDrivers,,16 HKLM,System\CurrentControlSet\Control\VMM32Files,,16 HKCU,AppEvents\Schemes\Apps\Explorer\Navigating\.Current,,,""

1 0

Marcus Meissner : crypt32: Free the encoded msg (Coverity).
by Alexandre Julliard 10 Jan '13

10 Jan '13

Module: wine Branch: master Commit: ee1f4164096ece5203b6a8ed64b331decbb931f7 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ee1f4164096ece5203b6a8ed6… Author: Marcus Meissner <meissner(a)suse.de> Date: Wed Jan 9 02:42:15 2013 +0100 crypt32: Free the encoded msg (Coverity). --- dlls/crypt32/msg.c | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/dlls/crypt32/msg.c b/dlls/crypt32/msg.c index 3e00a89..25204ea 100644 --- a/dlls/crypt32/msg.c +++ b/dlls/crypt32/msg.c @@ -1450,6 +1450,7 @@ static HCRYPTMSG CSignedEncodeMsg_Open(DWORD dwFlags, if (!ret) { CSignedEncodeMsg_Close(msg); + CryptMemFree(msg); msg = NULL; } }

1 0

Marcus Meissner : comctl32: Initialize SYSTEMTIME structs (Coverity).
by Alexandre Julliard 10 Jan '13

10 Jan '13

Module: wine Branch: master Commit: 1fe4af293cc496fc1aaf337e74e997d483021d57 URL: http://source.winehq.org/git/wine.git/?a=commit;h=1fe4af293cc496fc1aaf337e7… Author: Marcus Meissner <meissner(a)suse.de> Date: Wed Jan 9 02:42:13 2013 +0100 comctl32: Initialize SYSTEMTIME structs (Coverity). --- dlls/comctl32/tests/monthcal.c | 6 ++---- 1 files changed, 2 insertions(+), 4 deletions(-) diff --git a/dlls/comctl32/tests/monthcal.c b/dlls/comctl32/tests/monthcal.c index c7fd1e5..0cd064f 100644 --- a/dlls/comctl32/tests/monthcal.c +++ b/dlls/comctl32/tests/monthcal.c @@ -1368,10 +1368,8 @@ static void test_monthrange(void) hwnd = create_monthcal_control(0); - st_visible[0].wYear = 0; - st_visible[0].wMonth = 0; - st_visible[0].wDay = 0; - st_daystate[1] = st_daystate[0] = st_visible[1] = st_visible[0]; + memset(&st_visible, 0, sizeof(st_visible)); + memset(&st_daystate, 0, sizeof(st_daystate)); st.wYear = 2000; st.wMonth = 11;

1 0

Rico Schüller : d3dx9: Introduce a function for filling a texture.
by Alexandre Julliard 10 Jan '13

10 Jan '13

Module: wine Branch: master Commit: 275f784009308fbaed9db38a1462914cfd201f02 URL: http://source.winehq.org/git/wine.git/?a=commit;h=275f784009308fbaed9db38a1… Author: Rico Schüller <kgbricola(a)web.de> Date: Thu Jan 10 17:57:16 2013 +0100 d3dx9: Introduce a function for filling a texture. --- dlls/d3dx9_36/texture.c | 159 +++++++++++++++-------------------------------- 1 files changed, 51 insertions(+), 108 deletions(-) diff --git a/dlls/d3dx9_36/texture.c b/dlls/d3dx9_36/texture.c index 788a572..2531ea6 100644 --- a/dlls/d3dx9_36/texture.c +++ b/dlls/d3dx9_36/texture.c @@ -1206,18 +1206,57 @@ HRESULT WINAPI D3DXCreateVolumeTextureFromFileInMemoryEx(IDirect3DDevice9 *devic return D3D_OK; } +static inline void fill_texture(const struct pixel_format_desc *format, BYTE *pos, const D3DXVECTOR4 *value) +{ + DWORD c; + + for (c = 0; c < format->bytes_per_pixel; c++) + pos[c] = 0; + + for (c = 0; c < 4; c++) + { + float comp_value; + DWORD i, v; + + switch (c) + { + case 0: /* Alpha */ + comp_value = value->w; + break; + case 1: /* Red */ + comp_value = value->x; + break; + case 2: /* Green */ + comp_value = value->y; + break; + case 3: /* Blue */ + comp_value = value->z; + break; + } + + v = comp_value * ((1 << format->bits[c]) - 1) + 0.5f; + + for (i = 0; i < format->bits[c] + format->shift[c]; i += 8) + { + BYTE byte, mask; + + mask = ((1 << format->bits[c]) - 1) << format->shift[c] >> i; + byte = (v << format->shift[c] >> i) & mask; + pos[i / 8] |= byte; + } + } +} + HRESULT WINAPI D3DXFillTexture(struct IDirect3DTexture9 *texture, LPD3DXFILL2D function, void *funcdata) { DWORD miplevels; - DWORD m, i, x, y, c, v; + DWORD m, x, y; D3DSURFACE_DESC desc; D3DLOCKED_RECT lock_rect; D3DXVECTOR4 value; D3DXVECTOR2 coord, size; const struct pixel_format_desc *format; - BYTE *data, *pos; - BYTE byte, mask; - float comp_value; + BYTE *data; if (texture == NULL || function == NULL) return D3DERR_INVALIDCALL; @@ -1256,38 +1295,7 @@ HRESULT WINAPI D3DXFillTexture(struct IDirect3DTexture9 *texture, LPD3DXFILL2D f function(&value, &coord, &size, funcdata); - pos = data + y * lock_rect.Pitch + x * format->bytes_per_pixel; - - for (i = 0; i < format->bytes_per_pixel; i++) - pos[i] = 0; - - for (c = 0; c < 4; c++) - { - switch (c) - { - case 0: /* Alpha */ - comp_value = value.w; - break; - case 1: /* Red */ - comp_value = value.x; - break; - case 2: /* Green */ - comp_value = value.y; - break; - case 3: /* Blue */ - comp_value = value.z; - break; - } - - v = comp_value * ((1 << format->bits[c]) - 1) + 0.5f; - - for (i = 0; i < format->bits[c] + format->shift[c]; i += 8) - { - mask = ((1 << format->bits[c]) - 1) << format->shift[c] >> i; - byte = (v << format->shift[c] >> i) & mask; - pos[i / 8] |= byte; - } - } + fill_texture(format, data + y * lock_rect.Pitch + x * format->bytes_per_pixel, &value); } } IDirect3DTexture9_UnlockRect(texture, m); @@ -1600,15 +1608,13 @@ static float get_cube_coord(enum cube_coord coord, unsigned int x, unsigned int HRESULT WINAPI D3DXFillCubeTexture(struct IDirect3DCubeTexture9 *texture, LPD3DXFILL3D function, void *funcdata) { DWORD miplevels; - DWORD m, i, x, y, c, f, v; + DWORD m, x, y, f; D3DSURFACE_DESC desc; D3DLOCKED_RECT lock_rect; D3DXVECTOR4 value; D3DXVECTOR3 coord, size; const struct pixel_format_desc *format; - BYTE *data, *pos; - BYTE byte, mask; - float comp_value; + BYTE *data; static const enum cube_coord coordmap[6][3] = { {ONE, YCOORDINV, XCOORDINV}, @@ -1657,38 +1663,7 @@ HRESULT WINAPI D3DXFillCubeTexture(struct IDirect3DCubeTexture9 *texture, LPD3DX function(&value, &coord, &size, funcdata); - pos = data + y * lock_rect.Pitch + x * format->bytes_per_pixel; - - for (i = 0; i < format->bytes_per_pixel; i++) - pos[i] = 0; - - for (c = 0; c < 4; c++) - { - switch (c) - { - case 0: /* Alpha */ - comp_value = value.w; - break; - case 1: /* Red */ - comp_value = value.x; - break; - case 2: /* Green */ - comp_value = value.y; - break; - case 3: /* Blue */ - comp_value = value.z; - break; - } - - v = comp_value * ((1 << format->bits[c]) - 1) + 0.5f; - - for (i = 0; i < format->bits[c] + format->shift[c]; i += 8) - { - mask = ((1 << format->bits[c]) - 1) << format->shift[c] >> i; - byte = (v << format->shift[c] >> i) & mask; - pos[i / 8] |= byte; - } - } + fill_texture(format, data + y * lock_rect.Pitch + x * format->bytes_per_pixel, &value); } } IDirect3DCubeTexture9_UnlockRect(texture, f, m); @@ -1701,15 +1676,13 @@ HRESULT WINAPI D3DXFillCubeTexture(struct IDirect3DCubeTexture9 *texture, LPD3DX HRESULT WINAPI D3DXFillVolumeTexture(struct IDirect3DVolumeTexture9 *texture, LPD3DXFILL3D function, void *funcdata) { DWORD miplevels; - DWORD m, i, x, y, z, c, v; + DWORD m, x, y, z; D3DVOLUME_DESC desc; D3DLOCKED_BOX lock_box; D3DXVECTOR4 value; D3DXVECTOR3 coord, size; const struct pixel_format_desc *format; - BYTE *data, *pos; - BYTE byte, mask; - float comp_value; + BYTE *data; if (texture == NULL || function == NULL) return D3DERR_INVALIDCALL; @@ -1753,38 +1726,8 @@ HRESULT WINAPI D3DXFillVolumeTexture(struct IDirect3DVolumeTexture9 *texture, LP function(&value, &coord, &size, funcdata); - pos = data + z * lock_box.SlicePitch + y * lock_box.RowPitch + x * format->bytes_per_pixel; - - for (i = 0; i < format->bytes_per_pixel; i++) - pos[i] = 0; - - for (c = 0; c < 4; c++) - { - switch (c) - { - case 0: /* Alpha */ - comp_value = value.w; - break; - case 1: /* Red */ - comp_value = value.x; - break; - case 2: /* Green */ - comp_value = value.y; - break; - case 3: /* Blue */ - comp_value = value.z; - break; - } - - v = comp_value * ((1 << format->bits[c]) - 1) + 0.5f; - - for (i = 0; i < format->bits[c] + format->shift[c]; i += 8) - { - mask = ((1 << format->bits[c]) - 1) << format->shift[c] >> i; - byte = (v << format->shift[c] >> i) & mask; - pos[i / 8] |= byte; - } - } + fill_texture(format, data + z * lock_box.SlicePitch + y * lock_box.RowPitch + + x * format->bytes_per_pixel, &value); } } }

1 0

Rico Schüller : d3dx9: Shift only as much as needed.
by Alexandre Julliard 10 Jan '13

10 Jan '13

Module: wine Branch: master Commit: 98ef0ca8e685b197ed17aab608b676700b608e4f URL: http://source.winehq.org/git/wine.git/?a=commit;h=98ef0ca8e685b197ed17aab60… Author: Rico Schüller <kgbricola(a)web.de> Date: Thu Jan 10 17:57:25 2013 +0100 d3dx9: Shift only as much as needed. --- dlls/d3dx9_36/texture.c | 12 ++++++++++-- 1 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dlls/d3dx9_36/texture.c b/dlls/d3dx9_36/texture.c index 2531ea6..c93d2df 100644 --- a/dlls/d3dx9_36/texture.c +++ b/dlls/d3dx9_36/texture.c @@ -1240,8 +1240,16 @@ static inline void fill_texture(const struct pixel_format_desc *format, BYTE *po { BYTE byte, mask; - mask = ((1 << format->bits[c]) - 1) << format->shift[c] >> i; - byte = (v << format->shift[c] >> i) & mask; + if (format->shift[c] > i) + { + mask = ((1 << format->bits[c]) - 1) << (format->shift[c] - i); + byte = (v << (format->shift[c] - i)) & mask; + } + else + { + mask = ((1 << format->bits[c]) - 1) >> (i - format->shift[c]); + byte = (v >> (i - format->shift[c])) & mask; + } pos[i / 8] |= byte; } }

1 0

Rico Schüller : d3dx9: Use all 32 bits as mask.
by Alexandre Julliard 10 Jan '13

10 Jan '13

Module: wine Branch: master Commit: f7d877061d55eb12f1beb356a5b22b11c35e0d86 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f7d877061d55eb12f1beb356a… Author: Rico Schüller <kgbricola(a)web.de> Date: Thu Jan 10 17:57:40 2013 +0100 d3dx9: Use all 32 bits as mask. --- dlls/d3dx9_36/texture.c | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dlls/d3dx9_36/texture.c b/dlls/d3dx9_36/texture.c index c93d2df..a6e769b 100644 --- a/dlls/d3dx9_36/texture.c +++ b/dlls/d3dx9_36/texture.c @@ -1216,7 +1216,7 @@ static inline void fill_texture(const struct pixel_format_desc *format, BYTE *po for (c = 0; c < 4; c++) { float comp_value; - DWORD i, v; + DWORD i, v, mask32 = format->bits[c] == 32 ? ~0U : ((1 << format->bits[c]) - 1); switch (c) { @@ -1242,12 +1242,12 @@ static inline void fill_texture(const struct pixel_format_desc *format, BYTE *po if (format->shift[c] > i) { - mask = ((1 << format->bits[c]) - 1) << (format->shift[c] - i); + mask = mask32 << (format->shift[c] - i); byte = (v << (format->shift[c] - i)) & mask; } else { - mask = ((1 << format->bits[c]) - 1) >> (i - format->shift[c]); + mask = mask32 >> (i - format->shift[c]); byte = (v >> (i - format->shift[c])) & mask; } pos[i / 8] |= byte;

1 0

Piotr Caban : msvcrt: Added UTF16 support to read function.
by Alexandre Julliard 10 Jan '13

10 Jan '13

Module: wine Branch: master Commit: ac3cdc7ffa38f2e449f9e00c1e1fa1afde39ba26 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ac3cdc7ffa38f2e449f9e00c1… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jan 10 11:45:29 2013 +0100 msvcrt: Added UTF16 support to read function. --- dlls/msvcrt/file.c | 73 ++++++++++++++++++++++++++++++++++++++++----------- 1 files changed, 57 insertions(+), 16 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index 0818f8e..e3a477f 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -2112,7 +2112,7 @@ int CDECL MSVCRT__rmtmp(void) */ static int read_i(int fd, void *buf, unsigned int count) { - DWORD num_read; + DWORD num_read, utf16; char *bufstart = buf; HANDLE hand = msvcrt_fdtoh(fd); ioinfo *fdinfo = msvcrt_get_ioinfo(fd); @@ -2128,7 +2128,17 @@ static int read_i(int fd, void *buf, unsigned int count) if (count > 4) TRACE(":fd (%d) handle (%p) buf (%p) len (%d)\n",fd,hand,buf,count); if (hand == INVALID_HANDLE_VALUE) + { + *MSVCRT__errno() = MSVCRT_EBADF; + return -1; + } + + utf16 = (fdinfo->exflag & EF_UTF16) != 0; + if (((fdinfo->exflag&EF_UTF8) || utf16) && count&1) + { + *MSVCRT__errno() = MSVCRT_EINVAL; return -1; + } if (fdinfo->lookahead[0]!='\n' || ReadFile(hand, bufstart, count, &num_read, NULL)) { @@ -2137,10 +2147,24 @@ static int read_i(int fd, void *buf, unsigned int count) bufstart[0] = fdinfo->lookahead[0]; fdinfo->lookahead[0] = '\n'; - if(count>1 && ReadFile(hand, bufstart+1, count-1, &num_read, NULL)) - num_read++; + if (utf16) + { + bufstart[1] = fdinfo->lookahead[1]; + fdinfo->lookahead[1] = '\n'; + } + + if(count>1+utf16 && ReadFile(hand, bufstart+1+utf16, count-1-utf16, &num_read, NULL)) + num_read += 1+utf16; else - num_read = 1; + num_read = 1+utf16; + } + + if(utf16 && (num_read&1)) + { + /* msvcr90 uses uninitialized value from the buffer in this case */ + /* msvcrt ignores additional data */ + ERR("got odd number of bytes in UTF16 mode\n"); + num_read--; } if (count != 0 && num_read == 0) @@ -2152,15 +2176,15 @@ static int read_i(int fd, void *buf, unsigned int count) { DWORD i, j; - if (bufstart[0] == '\n') + if (bufstart[0]=='\n' && (!utf16 || bufstart[1]==0)) fdinfo->wxflag |= WX_READNL; else fdinfo->wxflag &= ~WX_READNL; - for (i=0, j=0; i<num_read; i++) + for (i=0, j=0; i<num_read; i+=1+utf16) { /* in text mode, a ctrl-z signals EOF */ - if (bufstart[i] == 0x1a) + if (bufstart[i]==0x1a && (!utf16 || bufstart[i+1]==0)) { fdinfo->wxflag |= WX_ATEOF; TRACE(":^Z EOF %s\n",debugstr_an(buf,num_read)); @@ -2168,31 +2192,48 @@ static int read_i(int fd, void *buf, unsigned int count) } /* in text mode, strip \r if followed by \n */ - if (bufstart[i]=='\r' && i+1==num_read) + if (bufstart[i]=='\r' && (!utf16 || bufstart[i+1]==0) && i+1+utf16==num_read) { - char lookahead; + char lookahead[2]; DWORD len; - if (ReadFile(hand, &lookahead, 1, &len, NULL) && len) + lookahead[1] = '\n'; + if (ReadFile(hand, lookahead, 1+utf16, &len, NULL) && len) { - if(lookahead=='\n' && j==0) + if(lookahead[0]=='\n' && (!utf16 || lookahead[1]==0) && j==0) + { bufstart[j++] = '\n'; + if(utf16) bufstart[j++] = 0; + } else { - if(lookahead != '\n') + if(lookahead[0]!='\n' || (utf16 && lookahead[1]!=0)) + { bufstart[j++] = '\r'; + if(utf16) bufstart[j++] = 0; + } if (fdinfo->wxflag & WX_PIPE) - fdinfo->lookahead[0] = lookahead; + { + fdinfo->lookahead[0] = lookahead[0]; + fdinfo->lookahead[1] = lookahead[1]; + } else - SetFilePointer(fdinfo->handle, -1, NULL, FILE_CURRENT); + SetFilePointer(fdinfo->handle, -1-utf16, NULL, FILE_CURRENT); } } else + { bufstart[j++] = '\r'; + if(utf16) bufstart[j++] = 0; + } + } + else if((bufstart[i]!='\r' || (utf16 && bufstart[i+1]!=0)) + || (bufstart[i+1+utf16]!='\n' || (utf16 && bufstart[i+3]!=0))) + { + bufstart[j++] = bufstart[i]; + if(utf16) bufstart[j++] = bufstart[i+1]; } - else if(bufstart[i]!='\r' || bufstart[i+1]!='\n') - bufstart[j++] = bufstart[i]; } num_read = j; }

1 0

Piotr Caban : msvcrt: Added UTF8 support to read function.
by Alexandre Julliard 10 Jan '13

10 Jan '13

Module: wine Branch: master Commit: d88aa37e59160ce5c6ca2be9dce30f7412c030b9 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d88aa37e59160ce5c6ca2be9d… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jan 10 11:45:39 2013 +0100 msvcrt: Added UTF8 support to read function. --- dlls/msvcrt/file.c | 182 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 182 insertions(+), 0 deletions(-) diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c index e3a477f..c53e061 100644 --- a/dlls/msvcrt/file.c +++ b/dlls/msvcrt/file.c @@ -2103,6 +2103,185 @@ int CDECL MSVCRT__rmtmp(void) return num_removed; } +static inline int get_utf8_char_len(char ch) +{ + if((ch&0xf8) == 0xf0) + return 4; + else if((ch&0xf0) == 0xe0) + return 3; + else if((ch&0xe0) == 0xc0) + return 2; + return 1; +} + +/********************************************************************* + * (internal) read_utf8 + */ +static int read_utf8(int fd, MSVCRT_wchar_t *buf, unsigned int count) +{ + ioinfo *fdinfo = msvcrt_get_ioinfo(fd); + HANDLE hand = fdinfo->handle; + char min_buf[4], *readbuf, lookahead; + DWORD readbuf_size, pos=0, num_read=1, char_len, i, j; + + /* make the buffer big enough to hold at least one character */ + /* read bytes have to fit to output and lookahead buffers */ + count /= 2; + readbuf_size = count < 4 ? 4 : count; + if(readbuf_size<=4 || !(readbuf = MSVCRT_malloc(readbuf_size))) { + readbuf_size = 4; + readbuf = min_buf; + } + + if(fdinfo->lookahead[0] != '\n') { + readbuf[pos++] = fdinfo->lookahead[0]; + fdinfo->lookahead[0] = '\n'; + + if(fdinfo->lookahead[1] != '\n') { + readbuf[pos++] = fdinfo->lookahead[1]; + fdinfo->lookahead[1] = '\n'; + + if(fdinfo->lookahead[2] != '\n') { + readbuf[pos++] = fdinfo->lookahead[2]; + fdinfo->lookahead[2] = '\n'; + } + } + } + + /* NOTE: this case is broken in native dll, reading + * sometimes fails when small buffer is passed + */ + if(count < 4) { + if(!pos && !ReadFile(hand, readbuf, 1, &num_read, NULL)) { + if (GetLastError() == ERROR_BROKEN_PIPE) { + fdinfo->wxflag |= WX_ATEOF; + return 0; + }else { + msvcrt_set_errno(GetLastError()); + return -1; + } + }else if(!num_read) { + fdinfo->wxflag |= WX_ATEOF; + return 0; + }else { + pos++; + } + + char_len = get_utf8_char_len(readbuf[0]); + if(char_len>pos) { + if(ReadFile(hand, readbuf+pos, char_len-pos, &num_read, NULL)) + pos += num_read; + } + + if(readbuf[0] == '\n') + fdinfo->wxflag |= WX_READNL; + else + fdinfo->wxflag &= ~WX_READNL; + + if(readbuf[0] == 0x1a) { + fdinfo->wxflag |= WX_ATEOF; + return 0; + } + + if(readbuf[0] == '\r') { + if(!ReadFile(hand, &lookahead, 1, &num_read, NULL) || num_read!=1) + buf[0] = '\r'; + else if(lookahead == '\n') + buf[0] = '\n'; + else { + buf[0] = '\r'; + if(fdinfo->wxflag & WX_PIPE) + fdinfo->lookahead[0] = lookahead; + else + SetFilePointer(fdinfo->handle, -1, NULL, FILE_CURRENT); + } + return 2; + } + + if(!(num_read = MultiByteToWideChar(CP_UTF8, 0, readbuf, pos, buf, count))) { + msvcrt_set_errno(GetLastError()); + return -1; + } + + return num_read*2; + } + + if(!ReadFile(hand, readbuf+pos, readbuf_size-pos, &num_read, NULL)) { + if(pos) { + num_read = 0; + }else if(GetLastError() == ERROR_BROKEN_PIPE) { + fdinfo->wxflag |= WX_ATEOF; + return 0; + }else { + msvcrt_set_errno(GetLastError()); + return -1; + } + }else if(!pos && !num_read) { + fdinfo->wxflag |= WX_ATEOF; + return 0; + } + + pos += num_read; + if(readbuf[0] == '\n') + fdinfo->wxflag |= WX_READNL; + else + fdinfo->wxflag &= ~WX_READNL; + + /* Find first byte of last character (may be incomplete) */ + for(i=pos-1; i>0 && i>pos-4; i--) + if((readbuf[i]&0xc0) != 0x80) + break; + char_len = get_utf8_char_len(readbuf[i]); + if(char_len+i <= pos) + i += char_len; + + if(fdinfo->wxflag & WX_PIPE) { + if(i < pos) + fdinfo->lookahead[0] = readbuf[i]; + if(i+1 < pos) + fdinfo->lookahead[1] = readbuf[i+1]; + if(i+2 < pos) + fdinfo->lookahead[2] = readbuf[i+2]; + }else if(i < pos) { + SetFilePointer(fdinfo->handle, i-pos, NULL, FILE_CURRENT); + } + pos = i; + + for(i=0, j=0; i<pos; i++) { + if(readbuf[i] == 0x1a) { + fdinfo->wxflag |= WX_ATEOF; + break; + } + + /* strip '\r' if followed by '\n' */ + if(readbuf[i] == '\r' && i+1==pos) { + if(fdinfo->lookahead[0] != '\n' || !ReadFile(hand, &lookahead, 1, &num_read, NULL) || !num_read) { + readbuf[j++] = '\r'; + }else if(lookahead == '\n' && j==0) { + readbuf[j++] = '\n'; + }else { + if(lookahead != '\n') + readbuf[j++] = '\r'; + + if(fdinfo->wxflag & WX_PIPE) + fdinfo->lookahead[0] = lookahead; + else + SetFilePointer(fdinfo->handle, -1, NULL, FILE_CURRENT); + } + }else if(readbuf[i]!='\r' || readbuf[i+1]!='\n') { + readbuf[j++] = readbuf[i]; + } + } + pos = j; + + if(!(num_read = MultiByteToWideChar(CP_UTF8, 0, readbuf, pos, buf, count))) { + msvcrt_set_errno(GetLastError()); + return -1; + } + + return num_read*2; +} + /********************************************************************* * (internal) read_i * @@ -2140,6 +2319,9 @@ static int read_i(int fd, void *buf, unsigned int count) return -1; } + if((fdinfo->wxflag&WX_TEXT) && (fdinfo->exflag&EF_UTF8)) + return read_utf8(fd, buf, count); + if (fdinfo->lookahead[0]!='\n' || ReadFile(hand, bufstart, count, &num_read, NULL)) { if (fdinfo->lookahead[0] != '\n')

1 0

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

10 Jan '13

Module: wine Branch: master Commit: 777f3498298e3ae60899c5a99c8ee06d6b6c4633 URL: http://source.winehq.org/git/wine.git/?a=commit;h=777f3498298e3ae60899c5a99… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jan 10 11:45:50 2013 +0100 msvcrt: Added read tests on unicode files. --- dlls/msvcrt/tests/file.c | 75 ++++++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 75 insertions(+), 0 deletions(-) diff --git a/dlls/msvcrt/tests/file.c b/dlls/msvcrt/tests/file.c index 7304b34..b74e1d9 100644 --- a/dlls/msvcrt/tests/file.c +++ b/dlls/msvcrt/tests/file.c @@ -1034,6 +1034,17 @@ static void test_file_write_read( void ) ok(!memcmp(btext, "\xff\xfe\x61\x00\r\x00\n\x00\xff\xff", 10), "btext is incorrect\n"); _close(tempfd); + tempfd = _open(tempf, _O_RDONLY|_O_WTEXT, 0); + ok(tempfd != -1, "_open failed with error: %d\n", errno); + errno = 0xdeadbeef; + ret = _read(tempfd, btext, 3); + ok(ret == -1, "_read returned %d, expected -1\n", ret); + ok(errno == 22, "errno = %d\n", errno); + ret = _read(tempfd, btext, sizeof(btext)); + ok(ret == 6, "_read returned %d, expected 6\n", ret); + ok(!memcmp(btext, "\x61\x00\n\x00\xff\xff", 6), "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; @@ -1050,6 +1061,44 @@ static void test_file_write_read( void ) 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); + + tempfd = _open(tempf, _O_RDONLY|_O_WTEXT, 0); + ok(tempfd != -1, "_open failed with error: %d\n", errno); + ret = _read(tempfd, btext, sizeof(btext)); + ok(ret == 6, "_read returned %d, expected 6\n", ret); + ok(!memcmp(btext, "\x61\x00\n\x00\x62\x00", 6), "btext is incorrect\n"); + + /* when buffer is small read sometimes fails in native implementation */ + lseek(tempfd, 3 /* skip bom */, SEEK_SET); + ret = _read(tempfd, btext, 4); + todo_wine ok(ret == -1, "_read returned %d, expected -1\n", ret); + + lseek(tempfd, 6, SEEK_SET); + ret = _read(tempfd, btext, 2); + ok(ret == 2, "_read returned %d, expected 2\n", ret); + ok(!memcmp(btext, "\x62\x00", 2), "btext is incorrect\n"); + _close(tempfd); + + tempfd = _open(tempf, _O_CREAT|_O_TRUNC|_O_WRONLY|_O_BINARY, _S_IWRITE); + ok(tempfd != -1, "_open failed with error: %d\n", errno); + ret = _write(tempfd, "\xef\xbb\xbf\x61\xc4\x85\x62\xc5\xbc\r\r\n", 12); + ok(ret == 12, "_write returned %d, expected 9\n", ret); + _close(tempfd); + + tempfd = _open(tempf, _O_RDONLY|_O_WTEXT, 0); + ok(tempfd != -1, "_open failed with error: %d\n", errno); + ret = _read(tempfd, btext, sizeof(btext)); + ok(ret == 12, "_read returned %d, expected 12\n", ret); + ok(!memcmp(btext, "\x61\x00\x05\x01\x62\x00\x7c\x01\x0d\x00\x0a\x00", 12), "btext is incorrect\n"); + + /* test invalid utf8 sequence */ + lseek(tempfd, 5, SEEK_SET); + ret = _read(tempfd, btext, sizeof(btext)); + todo_wine ok(ret == 10, "_read returned %d, expected 10\n", ret); + /* invalid char should be replaced by U+FFFD in MultiByteToWideChar */ + todo_wine ok(!memcmp(btext, "\xfd\xff", 2), "invalid UTF8 character was not replaced by U+FFFD\n"); + ok(!memcmp(btext+ret-8, "\x62\x00\x7c\x01\x0d\x00\x0a\x00", 8), "btext is incorrect\n"); + _close(tempfd); } else { @@ -1790,6 +1839,7 @@ static void test_pipes(const char* selfname) i=fclose(file); ok(!i, "unable to close the pipe: %d\n", errno); + /* test \r handling when it's the last character read */ if (_pipe(pipes, 1024, O_BINARY) < 0) { ok(0, "pipe failed with errno %d\n", errno); @@ -1810,6 +1860,31 @@ static void test_pipes(const char* selfname) r = read(pipes[0], buf, 1); ok(r == 1, "read returned %d, expected 1\n", r); ok(buf[0] == 'b', "buf[0] = %x, expected 'b'\n", buf[0]); + + if (p_fopen_s) + { + /* test utf16 read with insufficient data */ + r = write(pipes[1], "a\0b", 3); + ok(r == 3, "write returned %d, errno = %d\n", r, errno); + buf[2] = 'z'; + buf[3] = 'z'; + setmode(pipes[0], _O_WTEXT); + r = read(pipes[0], buf, 4); + ok(r == 2, "read returned %d, expected 2\n", r); + ok(!memcmp(buf, "a\0bz", 4), "read returned incorrect data\n"); + r = write(pipes[1], "\0", 1); + ok(r == 1, "write returned %d, errno = %d\n", r, errno); + buf[0] = 'z'; + buf[1] = 'z'; + r = read(pipes[0], buf, 2); + ok(r == 0, "read returned %d, expected 0\n", r); + ok(!memcmp(buf, "\0z", 2), "read returned incorrect data\n"); + } + else + { + win_skip("unicode mode tests on pipe\n"); + } + close(pipes[1]); close(pipes[0]); }

1 0

Henri Verbeet : ddraw: Avoid LPD3DLIGHT.
by Alexandre Julliard 10 Jan '13

10 Jan '13

Module: wine Branch: master Commit: b76a4700fc2933db1f5737d35f49c16d536e66bc URL: http://source.winehq.org/git/wine.git/?a=commit;h=b76a4700fc2933db1f5737d35… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jan 10 11:45:52 2013 +0100 ddraw: Avoid LPD3DLIGHT. --- include/d3d.h | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/d3d.h b/include/d3d.h index ba860a4..032040e 100644 --- a/include/d3d.h +++ b/include/d3d.h @@ -410,8 +410,8 @@ DECLARE_INTERFACE_(IDirect3DLight,IUnknown) STDMETHOD_(ULONG,Release)(THIS) PURE; /*** IDirect3DLight methods ***/ STDMETHOD(Initialize)(THIS_ IDirect3D *d3d) PURE; - STDMETHOD(SetLight)(THIS_ LPD3DLIGHT lpLight) PURE; - STDMETHOD(GetLight)(THIS_ LPD3DLIGHT lpLight) PURE; + STDMETHOD(SetLight)(THIS_ D3DLIGHT *data) PURE; + STDMETHOD(GetLight)(THIS_ D3DLIGHT *data) PURE; }; #undef INTERFACE

1 0