wine-commits January 2013

wine-commits@winehq.org

2 participants
736 discussions

Stefan Dösinger : ddraw: Don' t discard buffers that haven't been used in draws.
by Alexandre Julliard 10 Jan '13

10 Jan '13

Module: wine Branch: master Commit: d3520ef4653cb7bea035e08fc12428da70470185 URL: http://source.winehq.org/git/wine.git/?a=commit;h=d3520ef4653cb7bea035e08fc… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Thu Jan 10 11:52:16 2013 +0100 ddraw: Don't discard buffers that haven't been used in draws. --- dlls/ddraw/ddraw_private.h | 2 + dlls/ddraw/device.c | 7 ++++ dlls/ddraw/tests/ddraw4.c | 80 ++++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/tests/ddraw7.c | 80 ++++++++++++++++++++++++++++++++++++++++++++ dlls/ddraw/vertexbuffer.c | 6 +++- 5 files changed, 174 insertions(+), 1 deletions(-) diff --git a/dlls/ddraw/ddraw_private.h b/dlls/ddraw/ddraw_private.h index ed4cdfc..1ae1054 100644 --- a/dlls/ddraw/ddraw_private.h +++ b/dlls/ddraw/ddraw_private.h @@ -535,6 +535,8 @@ struct d3d_vertex_buffer DWORD fvf; DWORD size; BOOL dynamic; + + BOOL read_since_last_map; }; HRESULT d3d_vertex_buffer_create(struct d3d_vertex_buffer **buffer, struct ddraw *ddraw, diff --git a/dlls/ddraw/device.c b/dlls/ddraw/device.c index 601c96e..8201d75 100644 --- a/dlls/ddraw/device.c +++ b/dlls/ddraw/device.c @@ -4113,6 +4113,10 @@ static HRESULT d3d_device7_DrawPrimitiveVB(IDirect3DDevice7 *iface, D3DPRIMITIVE /* Now draw the primitives */ wined3d_device_set_primitive_type(device->wined3d_device, PrimitiveType); hr = wined3d_device_draw_primitive(device->wined3d_device, StartVertex, NumVertices); + + if (SUCCEEDED(hr)) + vb->read_since_last_map = TRUE; + wined3d_mutex_unlock(); return hr; @@ -4236,6 +4240,9 @@ static HRESULT d3d_device7_DrawIndexedPrimitiveVB(IDirect3DDevice7 *iface, wined3d_device_set_primitive_type(This->wined3d_device, PrimitiveType); hr = wined3d_device_draw_indexed_primitive(This->wined3d_device, ib_pos / sizeof(WORD), IndexCount); + if (SUCCEEDED(hr)) + vb->read_since_last_map = TRUE; + wined3d_mutex_unlock(); return hr; diff --git a/dlls/ddraw/tests/ddraw4.c b/dlls/ddraw/tests/ddraw4.c index a435b7a..2e9c845 100644 --- a/dlls/ddraw/tests/ddraw4.c +++ b/dlls/ddraw/tests/ddraw4.c @@ -2856,6 +2856,85 @@ static void test_coop_level_surf_create(void) IDirectDraw4_Release(ddraw); } +static void test_vb_discard(void) +{ + static const struct vec4 quad[] = + { + { 0.0f, 480.0f, 0.0f, 1.0f}, + { 0.0f, 0.0f, 0.0f, 1.0f}, + {640.0f, 480.0f, 0.0f, 1.0f}, + {640.0f, 0.0f, 0.0f, 1.0f}, + }; + + IDirect3DDevice3 *device; + IDirect3D3 *d3d; + IDirect3DVertexBuffer *buffer; + HWND window; + HRESULT hr; + D3DVERTEXBUFFERDESC desc; + BYTE *data; + static const unsigned int vbsize = 16; + unsigned int i; + + window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW, + 0, 0, 640, 480, 0, 0, 0, 0); + + if (!(device = create_device(window, DDSCL_NORMAL))) + { + skip("Failed to create D3D device, skipping test.\n"); + DestroyWindow(window); + return; + } + + hr = IDirect3DDevice3_GetDirect3D(device, &d3d); + ok(SUCCEEDED(hr), "Failed to get d3d interface, hr %#x.\n", hr); + + memset(&desc, 0, sizeof(desc)); + desc.dwSize = sizeof(desc); + desc.dwCaps = D3DVBCAPS_WRITEONLY; + desc.dwFVF = D3DFVF_XYZRHW; + desc.dwNumVertices = vbsize; + hr = IDirect3D3_CreateVertexBuffer(d3d, &desc, &buffer, 0, NULL); + ok(SUCCEEDED(hr), "Failed to create vertex buffer, hr %#x.\n", hr); + + hr = IDirect3DVertexBuffer_Lock(buffer, DDLOCK_DISCARDCONTENTS, (void **)&data, NULL); + ok(SUCCEEDED(hr), "Failed to lock vertex buffer, hr %#x.\n", hr); + memcpy(data, quad, sizeof(quad)); + hr = IDirect3DVertexBuffer_Unlock(buffer); + ok(SUCCEEDED(hr), "Failed to unlock vertex buffer, hr %#x.\n", hr); + + hr = IDirect3DDevice3_BeginScene(device); + ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); + hr = IDirect3DDevice3_DrawPrimitiveVB(device, D3DPT_TRIANGLESTRIP, buffer, 0, 4, 0); + ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + hr = IDirect3DDevice3_EndScene(device); + ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); + + hr = IDirect3DVertexBuffer_Lock(buffer, DDLOCK_DISCARDCONTENTS, (void **)&data, NULL); + ok(SUCCEEDED(hr), "Failed to lock vertex buffer, hr %#x.\n", hr); + memset(data, 0xaa, sizeof(struct vec4) * vbsize); + hr = IDirect3DVertexBuffer_Unlock(buffer); + ok(SUCCEEDED(hr), "Failed to unlock vertex buffer, hr %#x.\n", hr); + + hr = IDirect3DVertexBuffer_Lock(buffer, DDLOCK_DISCARDCONTENTS, (void **)&data, NULL); + ok(SUCCEEDED(hr), "Failed to lock vertex buffer, hr %#x.\n", hr); + for (i = 0; i < sizeof(struct vec4) * vbsize; i++) + { + if (data[i] != 0xaa) + { + ok(FALSE, "Vertex buffer data byte %u is 0x%02x, expected 0xaa\n", i, data[i]); + break; + } + } + hr = IDirect3DVertexBuffer_Unlock(buffer); + ok(SUCCEEDED(hr), "Failed to unlock vertex buffer, hr %#x.\n", hr); + + IDirect3DVertexBuffer_Release(buffer); + IDirect3D3_Release(d3d); + IDirect3DDevice3_Release(device); + DestroyWindow(window); +} + START_TEST(ddraw4) { test_process_vertices(); @@ -2879,4 +2958,5 @@ START_TEST(ddraw4) test_coop_level_mode_set_multi(); test_initialize(); test_coop_level_surf_create(); + test_vb_discard(); } diff --git a/dlls/ddraw/tests/ddraw7.c b/dlls/ddraw/tests/ddraw7.c index 7985b06..2b7e075 100644 --- a/dlls/ddraw/tests/ddraw7.c +++ b/dlls/ddraw/tests/ddraw7.c @@ -2665,6 +2665,85 @@ static void test_coop_level_surf_create(void) IDirectDraw7_Release(ddraw); } +static void test_vb_discard(void) +{ + static const struct vec4 quad[] = + { + { 0.0f, 480.0f, 0.0f, 1.0f}, + { 0.0f, 0.0f, 0.0f, 1.0f}, + {640.0f, 480.0f, 0.0f, 1.0f}, + {640.0f, 0.0f, 0.0f, 1.0f}, + }; + + IDirect3DDevice7 *device; + IDirect3D7 *d3d; + IDirect3DVertexBuffer7 *buffer; + HWND window; + HRESULT hr; + D3DVERTEXBUFFERDESC desc; + BYTE *data; + static const unsigned int vbsize = 16; + unsigned int i; + + window = CreateWindowA("static", "ddraw_test", WS_OVERLAPPEDWINDOW, + 0, 0, 640, 480, 0, 0, 0, 0); + + if (!(device = create_device(window, DDSCL_NORMAL))) + { + skip("Failed to create D3D device, skipping test.\n"); + DestroyWindow(window); + return; + } + + hr = IDirect3DDevice7_GetDirect3D(device, &d3d); + ok(SUCCEEDED(hr), "Failed to get d3d interface, hr %#x.\n", hr); + + memset(&desc, 0, sizeof(desc)); + desc.dwSize = sizeof(desc); + desc.dwCaps = D3DVBCAPS_WRITEONLY; + desc.dwFVF = D3DFVF_XYZRHW; + desc.dwNumVertices = vbsize; + hr = IDirect3D7_CreateVertexBuffer(d3d, &desc, &buffer, 0); + ok(SUCCEEDED(hr), "Failed to create vertex buffer, hr %#x.\n", hr); + + hr = IDirect3DVertexBuffer7_Lock(buffer, DDLOCK_DISCARDCONTENTS, (void **)&data, NULL); + ok(SUCCEEDED(hr), "Failed to lock vertex buffer, hr %#x.\n", hr); + memcpy(data, quad, sizeof(quad)); + hr = IDirect3DVertexBuffer7_Unlock(buffer); + ok(SUCCEEDED(hr), "Failed to unlock vertex buffer, hr %#x.\n", hr); + + hr = IDirect3DDevice7_BeginScene(device); + ok(SUCCEEDED(hr), "Failed to begin scene, hr %#x.\n", hr); + hr = IDirect3DDevice7_DrawPrimitiveVB(device, D3DPT_TRIANGLESTRIP, buffer, 0, 4, 0); + ok(SUCCEEDED(hr), "Failed to draw, hr %#x.\n", hr); + hr = IDirect3DDevice7_EndScene(device); + ok(SUCCEEDED(hr), "Failed to end scene, hr %#x.\n", hr); + + hr = IDirect3DVertexBuffer7_Lock(buffer, DDLOCK_DISCARDCONTENTS, (void **)&data, NULL); + ok(SUCCEEDED(hr), "Failed to lock vertex buffer, hr %#x.\n", hr); + memset(data, 0xaa, sizeof(struct vec4) * vbsize); + hr = IDirect3DVertexBuffer7_Unlock(buffer); + ok(SUCCEEDED(hr), "Failed to unlock vertex buffer, hr %#x.\n", hr); + + hr = IDirect3DVertexBuffer7_Lock(buffer, DDLOCK_DISCARDCONTENTS, (void **)&data, NULL); + ok(SUCCEEDED(hr), "Failed to lock vertex buffer, hr %#x.\n", hr); + for (i = 0; i < sizeof(struct vec4) * vbsize; i++) + { + if (data[i] != 0xaa) + { + ok(FALSE, "Vertex buffer data byte %u is 0x%02x, expected 0xaa\n", i, data[i]); + break; + } + } + hr = IDirect3DVertexBuffer7_Unlock(buffer); + ok(SUCCEEDED(hr), "Failed to unlock vertex buffer, hr %#x.\n", hr); + + IDirect3DVertexBuffer7_Release(buffer); + IDirect3D7_Release(d3d); + IDirect3DDevice7_Release(device); + DestroyWindow(window); +} + START_TEST(ddraw7) { HMODULE module = GetModuleHandleA("ddraw.dll"); @@ -2695,4 +2774,5 @@ START_TEST(ddraw7) test_coop_level_mode_set_multi(); test_initialize(); test_coop_level_surf_create(); + test_vb_discard(); } diff --git a/dlls/ddraw/vertexbuffer.c b/dlls/ddraw/vertexbuffer.c index 1b5d7af..5acd2e6 100644 --- a/dlls/ddraw/vertexbuffer.c +++ b/dlls/ddraw/vertexbuffer.c @@ -245,7 +245,7 @@ static HRESULT WINAPI d3d_vertex_buffer7_Lock(IDirect3DVertexBuffer7 *iface, wined3d_flags |= WINED3D_MAP_READONLY; if (flags & DDLOCK_NOOVERWRITE) wined3d_flags |= WINED3D_MAP_NOOVERWRITE; - if (flags & DDLOCK_DISCARDCONTENTS) + if (flags & DDLOCK_DISCARDCONTENTS && buffer->read_since_last_map) { wined3d_flags |= WINED3D_MAP_DISCARD; @@ -278,6 +278,10 @@ static HRESULT WINAPI d3d_vertex_buffer7_Lock(IDirect3DVertexBuffer7 *iface, } hr = wined3d_buffer_map(buffer->wineD3DVertexBuffer, 0, 0, (BYTE **)data, wined3d_flags); + + if (SUCCEEDED(hr)) + buffer->read_since_last_map = FALSE; + wined3d_mutex_unlock(); return hr;

1 0

Henri Verbeet : d3d9/tests: Merge query.c into device.c.
by Alexandre Julliard 10 Jan '13

10 Jan '13

Module: wine Branch: master Commit: 5fd85293633c4c86df75edc69797931d9082b451 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5fd85293633c4c86df75edc69… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jan 10 11:45:56 2013 +0100 d3d9/tests: Merge query.c into device.c. --- dlls/d3d9/tests/Makefile.in | 1 - dlls/d3d9/tests/device.c | 173 +++++++++++++++++++++++++ dlls/d3d9/tests/query.c | 291 ------------------------------------------- 3 files changed, 173 insertions(+), 292 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=5fd85293633c4c86df75e…

1 0

Henri Verbeet : d3d9/tests: Merge buffer.c into device.c.
by Alexandre Julliard 10 Jan '13

10 Jan '13

Module: wine Branch: master Commit: afca55649dafa872532c9850802953ecb3dbcfaf URL: http://source.winehq.org/git/wine.git/?a=commit;h=afca55649dafa872532c98508… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jan 10 11:45:55 2013 +0100 d3d9/tests: Merge buffer.c into device.c. --- dlls/d3d9/tests/Makefile.in | 1 - dlls/d3d9/tests/buffer.c | 190 ------------------------------------------- dlls/d3d9/tests/device.c | 152 ++++++++++++++++++++++++++++++++++- 3 files changed, 151 insertions(+), 192 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=afca55649dafa872532c9…

1 0

Henri Verbeet : d3d9/tests: Merge volume.c into device.c.
by Alexandre Julliard 10 Jan '13

10 Jan '13

Module: wine Branch: master Commit: 52a24e829724308e744150064d9fcc13a9a15e7f URL: http://source.winehq.org/git/wine.git/?a=commit;h=52a24e829724308e744150064… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jan 10 11:45:54 2013 +0100 d3d9/tests: Merge volume.c into device.c. --- dlls/d3d9/tests/Makefile.in | 3 +- dlls/d3d9/tests/device.c | 147 +++++++++++++++++++++++++++++++++++- dlls/d3d9/tests/volume.c | 176 ------------------------------------------- 3 files changed, 147 insertions(+), 179 deletions(-) Diff: http://source.winehq.org/git/wine.git/?a=commitdiff;h=52a24e829724308e74415…

1 0

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

10 Jan '13

Module: wine Branch: master Commit: 5687a27c56407ecfac6184cdfa34a13edb581348 URL: http://source.winehq.org/git/wine.git/?a=commit;h=5687a27c56407ecfac6184cdf… Author: Henri Verbeet <hverbeet(a)codeweavers.com> Date: Thu Jan 10 11:45:53 2013 +0100 ddraw: Avoid LPD3DLIGHT7. --- include/d3d.h | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/include/d3d.h b/include/d3d.h index 032040e..7cf1512 100644 --- a/include/d3d.h +++ b/include/d3d.h @@ -1311,8 +1311,8 @@ DECLARE_INTERFACE_(IDirect3DDevice7,IUnknown) STDMETHOD(GetViewport)(THIS_ D3DVIEWPORT7 *data) PURE; STDMETHOD(SetMaterial)(THIS_ D3DMATERIAL7 *data) PURE; STDMETHOD(GetMaterial)(THIS_ D3DMATERIAL7 *data) PURE; - STDMETHOD(SetLight)(THIS_ DWORD dwLightIndex,LPD3DLIGHT7 lpLight) PURE; - STDMETHOD(GetLight)(THIS_ DWORD dwLightIndex,LPD3DLIGHT7 lpLight) PURE; + STDMETHOD(SetLight)(THIS_ DWORD idx, D3DLIGHT7 *data) PURE; + STDMETHOD(GetLight)(THIS_ DWORD idx, D3DLIGHT7 *data) PURE; STDMETHOD(SetRenderState)(THIS_ D3DRENDERSTATETYPE dwRenderStateType, DWORD dwRenderState) PURE; STDMETHOD(GetRenderState)(THIS_ D3DRENDERSTATETYPE dwRenderStateType, LPDWORD lpdwRenderState) PURE; STDMETHOD(BeginStateBlock)(THIS) PURE;

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

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

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 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 more read tests.
by Alexandre Julliard 10 Jan '13

10 Jan '13

Module: wine Branch: master Commit: 62bd615452cc0216c54b7707b1102f8511938d7e URL: http://source.winehq.org/git/wine.git/?a=commit;h=62bd615452cc0216c54b7707b… Author: Piotr Caban <piotr(a)codeweavers.com> Date: Thu Jan 10 11:45:20 2013 +0100 msvcrt: Added more read tests. --- dlls/msvcrt/tests/file.c | 28 ++++++++++++++++++++++++++++ 1 files changed, 28 insertions(+), 0 deletions(-) diff --git a/dlls/msvcrt/tests/file.c b/dlls/msvcrt/tests/file.c index 7928b9e..7304b34 100644 --- a/dlls/msvcrt/tests/file.c +++ b/dlls/msvcrt/tests/file.c @@ -956,6 +956,11 @@ static void test_file_write_read( void ) _lseek(tempfd, -2, FILE_END); ret = _read(tempfd,btext,LLEN); ok(ret == 1 && *btext == '\n', "_read expected '\\n' got bad length: %d\n", ret); + _lseek(tempfd, -2, FILE_END); + ret = _read(tempfd,btext,1); + ok(ret == 1 && *btext == '\n', "_read returned %d, buf: %d\n", ret, *btext); + ret = read(tempfd,btext,1); + ok(ret == 0, "_read returned %d, expected 0\n", ret); _lseek(tempfd, -3, FILE_END); ret = _read(tempfd,btext,1); ok(ret == 1 && *btext == 'e', "_read expected 'e' got \"%.*s\" bad length: %d\n", ret, btext, ret); @@ -1784,6 +1789,29 @@ static void test_pipes(const char* selfname) i=fclose(file); ok(!i, "unable to close the pipe: %d\n", errno); + + if (_pipe(pipes, 1024, O_BINARY) < 0) + { + ok(0, "pipe failed with errno %d\n", errno); + return; + } + r = write(pipes[1], "\r\n\rab", 5); + ok(r == 5, "write returned %d, errno = %d\n", r, errno); + setmode(pipes[0], O_TEXT); + r = read(pipes[0], buf, 1); + ok(r == 1, "read returned %d, expected 1\n", r); + ok(buf[0] == '\n', "buf[0] = %x, expected '\\n'\n", buf[0]); + r = read(pipes[0], buf, 1); + ok(r == 1, "read returned %d, expected 1\n", r); + ok(buf[0] == '\r', "buf[0] = %x, expected '\\r'\n", buf[0]); + r = read(pipes[0], buf, 1); + ok(r == 1, "read returned %d, expected 1\n", r); + ok(buf[0] == 'a', "buf[0] = %x, expected 'a'\n", buf[0]); + 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]); + close(pipes[1]); + close(pipes[0]); } static void test_unlink(void)

1 0

← Newer
1
...
49
50
51
52
53
54
55
...
74
Older →

Jump to page:

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

2005

2004

2003

2002

2001

wine-commits January 2013