May 2017 - Wine-commits - list.winehq.org

Paul Gofman : d3dx9: Fix NAN handling in 'cmp' preshader opcode.
by Alexandre Julliard 22 May '17

22 May '17

Module: wine Branch: master Commit: f03de9ac4c3c85fc91dcbb1126ea5d1bad212358 URL: http://source.winehq.org/git/wine.git/?a=commit;h=f03de9ac4c3c85fc91dcbb112… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Mon May 22 13:24:11 2017 +0200 d3dx9: Fix NAN handling in 'cmp' preshader opcode. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/preshader.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/d3dx9_36/preshader.c b/dlls/d3dx9_36/preshader.c index 50ab18f..40a86fa 100644 --- a/dlls/d3dx9_36/preshader.c +++ b/dlls/d3dx9_36/preshader.c @@ -102,7 +102,7 @@ static double pres_ge(double *args, int n) {return args[0] >= args[1] ? 1.0 : 0 static double pres_frc(double *args, int n) {return args[0] - floor(args[0]);} static double pres_min(double *args, int n) {return fmin(args[0], args[1]);} static double pres_max(double *args, int n) {return fmax(args[0], args[1]);} -static double pres_cmp(double *args, int n) {return args[0] < 0.0 ? args[2] : args[1];} +static double pres_cmp(double *args, int n) {return args[0] >= 0.0 ? args[1] : args[2];} static double pres_sin(double *args, int n) {return sin(args[0]);} static double pres_cos(double *args, int n) {return cos(args[0]);} static double pres_rsq(double *args, int n)

1 0

Paul Gofman : d3dx9: Use pass update version for detecting updated FXLC parameter.
by Alexandre Julliard 22 May '17

22 May '17

Module: wine Branch: master Commit: 174ea70bf3301fd837518e376a2f5b097fac5503 URL: http://source.winehq.org/git/wine.git/?a=commit;h=174ea70bf3301fd837518e376… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Mon May 22 13:24:12 2017 +0200 d3dx9: Use pass update version for detecting updated FXLC parameter. Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/effect.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dlls/d3dx9_36/effect.c b/dlls/d3dx9_36/effect.c index 511ed32..e9b139e 100644 --- a/dlls/d3dx9_36/effect.c +++ b/dlls/d3dx9_36/effect.c @@ -1092,7 +1092,10 @@ static HRESULT d3dx9_get_param_value_ptr(struct d3dx_pass *pass, struct d3dx_sta { *out_param = param; *param_value = param->data; - if (update_all || is_param_eval_input_dirty(param->param_eval, ULONG64_MAX)) + /* We check with the update_version of the pass because the + * same preshader might be used by both the vertex and the + * pixel shader (that can happen e.g. for sampler states). */ + if (update_all || is_param_eval_input_dirty(param->param_eval, pass->update_version)) { *param_dirty = TRUE; return d3dx_evaluate_parameter(param->param_eval, param, *param_value);

1 0

Paul Gofman : d3dx9/tests: Check pixel shader sampler states in test_effect_commitchanges().
by Alexandre Julliard 22 May '17

22 May '17

Module: wine Branch: master Commit: 37bdb8e8cdacec4ef17a17e51e97a0a7233004e4 URL: http://source.winehq.org/git/wine.git/?a=commit;h=37bdb8e8cdacec4ef17a17e51… Author: Paul Gofman <gofmanp(a)gmail.com> Date: Fri May 19 20:30:08 2017 +0300 d3dx9/tests: Check pixel shader sampler states in test_effect_commitchanges(). Signed-off-by: Paul Gofman <gofmanp(a)gmail.com> Signed-off-by: Matteo Bruni <mbruni(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/d3dx9_36/tests/effect.c | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/dlls/d3dx9_36/tests/effect.c b/dlls/d3dx9_36/tests/effect.c index 09b786b..1bd471a 100644 --- a/dlls/d3dx9_36/tests/effect.c +++ b/dlls/d3dx9_36/tests/effect.c @@ -5122,6 +5122,10 @@ static void test_effect_commitchanges(IDirect3DDevice9 *device) ok(hr == D3D_OK, "Got result %#x.\n", hr); hr = IDirect3DDevice9_SetSamplerState(device, D3DVERTEXTEXTURESAMPLER0, D3DSAMP_MAGFILTER, 0); ok(hr == D3D_OK, "Got result %#x.\n", hr); + hr = IDirect3DDevice9_SetSamplerState(device, 0, D3DSAMP_MINFILTER, 0); + ok(hr == D3D_OK, "Got result %#x.\n", hr); + hr = IDirect3DDevice9_SetSamplerState(device, 0, D3DSAMP_MAGFILTER, 0); + ok(hr == D3D_OK, "Got result %#x.\n", hr); hr = IDirect3DDevice9_SetVertexShader(device, NULL); ok(hr == D3D_OK, "Got result %#x.\n", hr); @@ -5141,6 +5145,12 @@ static void test_effect_commitchanges(IDirect3DDevice9 *device) hr = IDirect3DDevice9_GetSamplerState(device, D3DVERTEXTEXTURESAMPLER0, D3DSAMP_MAGFILTER, &value); ok(hr == D3D_OK, "Got result %#x.\n", hr); ok(value == 0, "Unexpected sampler 0 minfilter %u.\n", value); + hr = IDirect3DDevice9_GetSamplerState(device, 0, D3DSAMP_MINFILTER, &value); + ok(hr == D3D_OK, "Got result %#x.\n", hr); + ok(value == 1, "Unexpected sampler 0 minfilter %u.\n", value); + hr = IDirect3DDevice9_GetSamplerState(device, 0, D3DSAMP_MAGFILTER, &value); + ok(hr == D3D_OK, "Got result %#x.\n", hr); + ok(value == 0, "Unexpected sampler 0 minfilter %u.\n", value); ivect[3] = 2; hr = effect->lpVtbl->SetValue(effect, param, ivect, sizeof(ivect));

1 0

Zebediah Figura : kernel32: Implement bytes left in PeekNamedPipe().
by Alexandre Julliard 22 May '17

22 May '17

Module: wine Branch: master Commit: d37bfe960f6fb554f0d4e24052d6b802ba745f1a URL: http://source.winehq.org/git/wine.git/?a=commit;h=d37bfe960f6fb554f0d4e2405… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun May 21 08:53:51 2017 -0500 kernel32: Implement bytes left in PeekNamedPipe(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/sync.c | 2 +- server/named_pipe.c | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/dlls/kernel32/sync.c b/dlls/kernel32/sync.c index ee995f5..d3d46b7 100644 --- a/dlls/kernel32/sync.c +++ b/dlls/kernel32/sync.c @@ -1475,7 +1475,7 @@ BOOL WINAPI PeekNamedPipe( HANDLE hPipe, LPVOID lpvBuffer, DWORD cbBuffer, ULONG read_size = io.Information - FIELD_OFFSET( FILE_PIPE_PEEK_BUFFER, Data ); if (lpcbAvail) *lpcbAvail = buffer->ReadDataAvailable; if (lpcbRead) *lpcbRead = read_size; - if (lpcbMessage) *lpcbMessage = 0; /* FIXME */ + if (lpcbMessage) *lpcbMessage = buffer->MessageLength - read_size; if (lpvBuffer) memcpy( lpvBuffer, buffer->Data, read_size ); } else SetLastError( RtlNtStatusToDosError(status) ); diff --git a/server/named_pipe.c b/server/named_pipe.c index b8ea426..0c314bd 100644 --- a/server/named_pipe.c +++ b/server/named_pipe.c @@ -927,6 +927,7 @@ static void pipe_end_peek( struct pipe_end *pipe_end ) FILE_PIPE_PEEK_BUFFER *buffer; struct pipe_message *message; data_size_t avail = 0; + data_size_t message_length = 0; if (!use_server_io( pipe_end )) { @@ -947,7 +948,8 @@ static void pipe_end_peek( struct pipe_end *pipe_end ) if (avail) { message = LIST_ENTRY( list_head(&pipe_end->message_queue), struct pipe_message, entry ); - reply_size = min( reply_size, message->iosb->in_size - message->read_pos ); + message_length = message->iosb->in_size - message->read_pos; + reply_size = min( reply_size, message_length ); } else reply_size = 0; @@ -955,7 +957,7 @@ static void pipe_end_peek( struct pipe_end *pipe_end ) buffer->NamedPipeState = 0; /* FIXME */ buffer->ReadDataAvailable = avail; buffer->NumberOfMessages = 0; /* FIXME */ - buffer->MessageLength = 0; /* FIXME */ + buffer->MessageLength = message_length; if (reply_size) memcpy( buffer->Data, (const char *)message->iosb->in_data + message->read_pos, reply_size ); }

1 0

Zebediah Figura : kernel32/tests: Test bytes left in PeekNamedPipe().
by Alexandre Julliard 22 May '17

22 May '17

Module: wine Branch: master Commit: ad2f1efe01fe6a402878a56743c671f037dfa3e2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=ad2f1efe01fe6a402878a5674… Author: Zebediah Figura <z.figura12(a)gmail.com> Date: Sun May 21 08:53:52 2017 -0500 kernel32/tests: Test bytes left in PeekNamedPipe(). Signed-off-by: Zebediah Figura <z.figura12(a)gmail.com> Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/pipe.c | 63 ++++++++++++++++++++++++++++++++++++++-------- 1 file changed, 53 insertions(+), 10 deletions(-) diff --git a/dlls/kernel32/tests/pipe.c b/dlls/kernel32/tests/pipe.c index 77450e3..e27e29e 100644 --- a/dlls/kernel32/tests/pipe.c +++ b/dlls/kernel32/tests/pipe.c @@ -149,6 +149,7 @@ static void test_CreateNamedPipe(int pipemode) DWORD written; DWORD readden; DWORD avail; + DWORD left; DWORD lpmode; BOOL ret; @@ -240,8 +241,12 @@ static void test_CreateNamedPipe(int pipemode) memset(ibuf, 0, sizeof(ibuf)); ok(WriteFile(hnp, obuf, sizeof(obuf), &written, NULL), "WriteFile\n"); ok(written == sizeof(obuf), "write file len 1\n"); - ok(PeekNamedPipe(hFile, NULL, 0, NULL, &readden, NULL), "Peek\n"); - ok(readden == sizeof(obuf), "peek 1 got %d bytes\n", readden); + ok(PeekNamedPipe(hFile, NULL, 0, NULL, &avail, &left), "Peek\n"); + ok(avail == sizeof(obuf), "peek 1 got %d bytes\n", avail); + if (pipemode == PIPE_TYPE_BYTE) + ok(left == 0, "peek 1 got %d bytes left\n", left); + else + ok(left == sizeof(obuf), "peek 1 got %d bytes left\n", left); ok(ReadFile(hFile, ibuf, sizeof(ibuf), &readden, NULL), "ReadFile\n"); ok(readden == sizeof(obuf), "read 1 got %d bytes\n", readden); ok(memcmp(obuf, ibuf, written) == 0, "content 1 check\n"); @@ -249,10 +254,18 @@ static void test_CreateNamedPipe(int pipemode) memset(ibuf, 0, sizeof(ibuf)); ok(WriteFile(hFile, obuf2, sizeof(obuf2), &written, NULL), "WriteFile\n"); ok(written == sizeof(obuf2), "write file len 2\n"); - ok(PeekNamedPipe(hnp, NULL, 0, NULL, &readden, NULL), "Peek\n"); - ok(readden == sizeof(obuf2), "peek 2 got %d bytes\n", readden); - ok(PeekNamedPipe(hnp, (LPVOID)1, 0, NULL, &readden, NULL), "Peek\n"); - ok(readden == sizeof(obuf2), "peek 2 got %d bytes\n", readden); + ok(PeekNamedPipe(hnp, NULL, 0, NULL, &avail, &left), "Peek\n"); + ok(avail == sizeof(obuf2), "peek 2 got %d bytes\n", avail); + if (pipemode == PIPE_TYPE_BYTE) + ok(left == 0, "peek 2 got %d bytes left\n", left); + else + ok(left == sizeof(obuf2), "peek 2 got %d bytes left\n", left); + ok(PeekNamedPipe(hnp, (LPVOID)1, 0, NULL, &avail, &left), "Peek\n"); + ok(avail == sizeof(obuf2), "peek 2 got %d bytes\n", avail); + if (pipemode == PIPE_TYPE_BYTE) + ok(left == 0, "peek 2 got %d bytes left\n", left); + else + ok(left == sizeof(obuf2), "peek 2 got %d bytes left\n", left); ok(ReadFile(hnp, ibuf, sizeof(ibuf), &readden, NULL), "ReadFile\n"); ok(readden == sizeof(obuf2), "read 2 got %d bytes\n", readden); ok(memcmp(obuf2, ibuf, written) == 0, "content 2 check\n"); @@ -261,6 +274,13 @@ static void test_CreateNamedPipe(int pipemode) memset(ibuf, 0, sizeof(ibuf)); ok(WriteFile(hnp, obuf2, sizeof(obuf2), &written, NULL), "WriteFile\n"); ok(written == sizeof(obuf2), "write file len\n"); + ok(PeekNamedPipe(hFile, ibuf, 4, &readden, &avail, &left), "Peek\n"); + ok(readden == 4, "peek got %d bytes\n", readden); + ok(avail == sizeof(obuf2), "peek got %d bytes available\n", avail); + if (pipemode == PIPE_TYPE_BYTE) + ok(left == -4, "peek got %d bytes left\n", left); + else + ok(left == sizeof(obuf2)-4, "peek got %d bytes left\n", left); ok(ReadFile(hFile, ibuf, 4, &readden, NULL), "ReadFile\n"); ok(readden == 4, "read got %d bytes\n", readden); ok(ReadFile(hFile, ibuf + 4, sizeof(ibuf) - 4, &readden, NULL), "ReadFile\n"); @@ -270,12 +290,17 @@ static void test_CreateNamedPipe(int pipemode) memset(ibuf, 0, sizeof(ibuf)); ok(WriteFile(hFile, obuf, sizeof(obuf), &written, NULL), "WriteFile\n"); ok(written == sizeof(obuf), "write file len\n"); + ok(PeekNamedPipe(hnp, ibuf, 4, &readden, &avail, &left), "Peek\n"); + ok(readden == 4, "peek got %d bytes\n", readden); + ok(avail == sizeof(obuf), "peek got %d bytes available\n", avail); if (pipemode == PIPE_TYPE_BYTE) { + ok(left == -4, "peek got %d bytes left\n", left); ok(ReadFile(hnp, ibuf, 4, &readden, NULL), "ReadFile\n"); } else { + ok(left == sizeof(obuf)-4, "peek got %d bytes left\n", left); SetLastError(0xdeadbeef); ok(!ReadFile(hnp, ibuf, 4, &readden, NULL), "ReadFile\n"); ok(GetLastError() == ERROR_MORE_DATA, "wrong error\n"); @@ -316,15 +341,24 @@ static void test_CreateNamedPipe(int pipemode) ok(written == sizeof(obuf), "write file len 3a\n"); ok(WriteFile(hnp, obuf2, sizeof(obuf2), &written, NULL), " WriteFile3b\n"); ok(written == sizeof(obuf2), "write file len 3b\n"); - ok(PeekNamedPipe(hFile, ibuf, sizeof(ibuf), &readden, &avail, NULL), "Peek3\n"); + ok(PeekNamedPipe(hFile, ibuf, 4, &readden, &avail, &left), "Peek3\n"); + ok(readden == 4, "peek3 got %d bytes\n", readden); + if (pipemode == PIPE_TYPE_BYTE) + ok(left == -4, "peek3 got %d bytes left\n", left); + else + ok(left == sizeof(obuf)-4, "peek3 got %d bytes left\n", left); + ok(avail == sizeof(obuf) + sizeof(obuf2), "peek3 got %d bytes available\n", avail); + ok(PeekNamedPipe(hFile, ibuf, sizeof(ibuf), &readden, &avail, &left), "Peek3\n"); if (pipemode == PIPE_TYPE_BYTE) { /* currently the Wine behavior depends on the kernel version */ /* ok(readden == sizeof(obuf) + sizeof(obuf2), "peek3 got %d bytes\n", readden); */ if (readden != sizeof(obuf) + sizeof(obuf2)) todo_wine ok(0, "peek3 got %d bytes\n", readden); + ok(left == (DWORD) -(sizeof(obuf) + sizeof(obuf2)), "peek3 got %d bytes left\n", left); } else { ok(readden == sizeof(obuf), "peek3 got %d bytes\n", readden); + ok(left == 0, "peek3 got %d bytes left\n", left); } ok(avail == sizeof(obuf) + sizeof(obuf2), "peek3 got %d bytes available\n", avail); pbuf = ibuf; @@ -346,15 +380,24 @@ static void test_CreateNamedPipe(int pipemode) ok(written == sizeof(obuf), "write file len 4a\n"); ok(WriteFile(hFile, obuf2, sizeof(obuf2), &written, NULL), " WriteFile4b\n"); ok(written == sizeof(obuf2), "write file len 4b\n"); - ok(PeekNamedPipe(hnp, ibuf, sizeof(ibuf), &readden, &avail, NULL), "Peek4\n"); + ok(PeekNamedPipe(hnp, ibuf, 4, &readden, &avail, &left), "Peek3\n"); + ok(readden == 4, "peek3 got %d bytes\n", readden); + if (pipemode == PIPE_TYPE_BYTE) + ok(left == -4, "peek3 got %d bytes left\n", left); + else + ok(left == sizeof(obuf)-4, "peek3 got %d bytes left\n", left); + ok(avail == sizeof(obuf) + sizeof(obuf2), "peek3 got %d bytes available\n", avail); + ok(PeekNamedPipe(hnp, ibuf, sizeof(ibuf), &readden, &avail, &left), "Peek4\n"); if (pipemode == PIPE_TYPE_BYTE) { /* currently the Wine behavior depends on the kernel version */ /* ok(readden == sizeof(obuf) + sizeof(obuf2), "peek4 got %d bytes\n", readden); */ if (readden != sizeof(obuf) + sizeof(obuf2)) todo_wine ok(0, "peek4 got %d bytes\n", readden); + ok(left == (DWORD) -(sizeof(obuf) + sizeof(obuf2)), "peek4 got %d bytes left\n", left); } else { ok(readden == sizeof(obuf), "peek4 got %d bytes\n", readden); + ok(left == 0, "peek4 got %d bytes left\n", left); } ok(avail == sizeof(obuf) + sizeof(obuf2), "peek4 got %d bytes available\n", avail); pbuf = ibuf; @@ -392,10 +435,10 @@ static void test_CreateNamedPipe(int pipemode) ok(written == sizeof(obuf), "write file len 3a\n"); ok(WriteFile(hnp, obuf2, sizeof(obuf2), &written, NULL), " WriteFile5b\n"); ok(written == sizeof(obuf2), "write file len 3b\n"); - ok(PeekNamedPipe(hFile, ibuf, sizeof(ibuf), &readden, &avail, NULL), "Peek5\n"); + ok(PeekNamedPipe(hFile, ibuf, sizeof(ibuf), &readden, &avail, &left), "Peek5\n"); ok(readden == sizeof(obuf), "peek5 got %d bytes\n", readden); - ok(avail == sizeof(obuf) + sizeof(obuf2), "peek5 got %d bytes available\n", avail); + ok(left == 0, "peek5 got %d bytes left\n", left); pbuf = ibuf; ok(memcmp(obuf, pbuf, sizeof(obuf)) == 0, "content 5a check\n"); ok(ReadFile(hFile, ibuf, sizeof(ibuf), &readden, NULL), "ReadFile\n");

1 0

Jacek Caban : kernel32/tests: Added more PeekNamedPipe tests.
by Alexandre Julliard 22 May '17

22 May '17

Module: wine Branch: master Commit: 9d011931db89afec1f56f56bd90c40eb162ae0c2 URL: http://source.winehq.org/git/wine.git/?a=commit;h=9d011931db89afec1f56f56bd… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon May 22 13:40:58 2017 +0200 kernel32/tests: Added more PeekNamedPipe tests. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/pipe.c | 42 +++++++++++++++++++++++++++++++++--------- 1 file changed, 33 insertions(+), 9 deletions(-) diff --git a/dlls/kernel32/tests/pipe.c b/dlls/kernel32/tests/pipe.c index e27e29e..8c62bd0 100644 --- a/dlls/kernel32/tests/pipe.c +++ b/dlls/kernel32/tests/pipe.c @@ -26,6 +26,7 @@ #include "windef.h" #include "winbase.h" #include "winternl.h" +#include "winioctl.h" #include "wine/test.h" #define PIPENAME "\\\\.\\PiPe\\tests_pipe.c" @@ -2534,17 +2535,40 @@ todo_wine CloseHandle(event); } -#define test_peek_pipe(a,b,c) _test_peek_pipe(__LINE__,a,b,c) -static void _test_peek_pipe(unsigned line, HANDLE pipe, DWORD expected_read, DWORD expected_avail) +#define test_peek_pipe(a,b,c,d) _test_peek_pipe(__LINE__,a,b,c,d) +static void _test_peek_pipe(unsigned line, HANDLE pipe, DWORD expected_read, DWORD expected_avail, DWORD expected_message_length) { - DWORD bytes_read = 0xdeadbeed, avail = 0xdeadbeef; + DWORD bytes_read = 0xdeadbeed, avail = 0xdeadbeef, left = 0xdeadbeed; char buf[4000]; + FILE_PIPE_PEEK_BUFFER *peek_buf = (void*)buf; + IO_STATUS_BLOCK io; + NTSTATUS status; BOOL r; - r = PeekNamedPipe(pipe, buf, sizeof(buf), &bytes_read, &avail, NULL); + r = PeekNamedPipe(pipe, buf, sizeof(buf), &bytes_read, &avail, &left); ok_(__FILE__,line)(r, "PeekNamedPipe failed: %u\n", GetLastError()); ok_(__FILE__,line)(bytes_read == expected_read, "bytes_read = %u, expected %u\n", bytes_read, expected_read); ok_(__FILE__,line)(avail == expected_avail, "avail = %u, expected %u\n", avail, expected_avail); + ok_(__FILE__,line)(left == expected_message_length - expected_read, "left = %d, expected %d\n", + left, expected_message_length - expected_read); + + status = NtFsControlFile(pipe, 0, NULL, NULL, &io, FSCTL_PIPE_PEEK, NULL, 0, buf, sizeof(buf)); + ok_(__FILE__,line)(!status || status == STATUS_PENDING, "NtFsControlFile(FSCTL_PIPE_PEEK) failed: %x\n", status); + ok_(__FILE__,line)(io.Information == FIELD_OFFSET(FILE_PIPE_PEEK_BUFFER, Data[expected_read]), + "io.Information = %lu\n", io.Information); + ok_(__FILE__,line)(peek_buf->ReadDataAvailable == expected_avail, "ReadDataAvailable = %u, expected %u\n", + peek_buf->ReadDataAvailable, expected_avail); + ok_(__FILE__,line)(peek_buf->MessageLength == expected_message_length, "MessageLength = %u, expected %u\n", + peek_buf->MessageLength, expected_message_length); + + if (expected_read) + { + r = PeekNamedPipe(pipe, buf, 1, &bytes_read, &avail, &left); + ok_(__FILE__,line)(r, "PeekNamedPipe failed: %u\n", GetLastError()); + ok_(__FILE__,line)(bytes_read == 1, "bytes_read = %u, expected %u\n", bytes_read, expected_read); + ok_(__FILE__,line)(avail == expected_avail, "avail = %u, expected %u\n", avail, expected_avail); + ok_(__FILE__,line)(left == expected_message_length-1, "left = %d, expected %d\n", left, expected_message_length-1); + } } #define overlapped_read_sync(a,b,c,d,e) _overlapped_read_sync(__LINE__,a,b,c,d,e) @@ -2728,7 +2752,7 @@ static void test_blocking_rw(HANDLE writer, HANDLE reader, DWORD buf_size, BOOL /* test pending read with overlapped event */ overlapped_read_async(reader, read_buf, 1000, &read_overlapped); test_flush_sync(writer); - test_peek_pipe(reader, 0, 0); + test_peek_pipe(reader, 0, 0, 0); /* write more data than needed for read */ overlapped_write_sync(writer, buf, 4000); @@ -2813,13 +2837,13 @@ static void test_blocking_rw(HANDLE writer, HANDLE reader, DWORD buf_size, BOOL test_overlapped_result(reader, &read_overlapped2, 1, FALSE); overlapped_write_sync(writer, buf, 20); - test_peek_pipe(reader, 20, 20); + test_peek_pipe(reader, 20, 20, msg_mode ? 20 : 0); overlapped_write_sync(writer, buf, 15); - test_peek_pipe(reader, msg_mode ? 20 : 35, 35); + test_peek_pipe(reader, msg_mode ? 20 : 35, 35, msg_mode ? 20 : 0); overlapped_read_sync(reader, read_buf, 10, 10, msg_read); - test_peek_pipe(reader, msg_mode ? 10 : 25, 25); + test_peek_pipe(reader, msg_mode ? 10 : 25, 25, msg_mode ? 10 : 0); overlapped_read_sync(reader, read_buf, 10, 10, FALSE); - test_peek_pipe(reader, 15, 15); + test_peek_pipe(reader, 15, 15, msg_mode ? 15 : 0); overlapped_read_sync(reader, read_buf, 15, 15, FALSE); if(!pCancelIoEx) {

1 0

Jacek Caban : kernel32/tests: Run test_overlapped_transport in byte mode.
by Alexandre Julliard 22 May '17

22 May '17

Module: wine Branch: master Commit: 0657b1d1f43968e07177519cc8d35d90a0ed8b59 URL: http://source.winehq.org/git/wine.git/?a=commit;h=0657b1d1f43968e07177519cc… Author: Jacek Caban <jacek(a)codeweavers.com> Date: Mon May 22 13:46:14 2017 +0200 kernel32/tests: Run test_overlapped_transport in byte mode. Signed-off-by: Jacek Caban <jacek(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/kernel32/tests/pipe.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dlls/kernel32/tests/pipe.c b/dlls/kernel32/tests/pipe.c index 8c62bd0..0a6edd6 100644 --- a/dlls/kernel32/tests/pipe.c +++ b/dlls/kernel32/tests/pipe.c @@ -3056,4 +3056,6 @@ START_TEST(pipe) test_readfileex_pending(); test_overlapped_transport(TRUE, FALSE); test_overlapped_transport(TRUE, TRUE); + if (broken(1)) /* FIXME: Remove once Wine is ready. */ + test_overlapped_transport(FALSE, FALSE); }

1 0

Stefan Dösinger : msvcp: Implement the wchar version of _Open_dir.
by Alexandre Julliard 22 May '17

22 May '17

Module: wine Branch: master Commit: 4193e717b6221d78fe2d7a559024df0f7468a834 URL: http://source.winehq.org/git/wine.git/?a=commit;h=4193e717b6221d78fe2d7a559… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon May 22 15:59:44 2017 +0200 msvcp: Implement the wchar version of _Open_dir. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp110/msvcp110.spec | 4 +-- dlls/msvcp120/msvcp120.spec | 4 +-- dlls/msvcp120_app/msvcp120_app.spec | 4 +-- dlls/msvcp140/msvcp140.spec | 2 +- dlls/msvcp90/ios.c | 58 ++++++++++++++++++++++++++++--------- 5 files changed, 51 insertions(+), 21 deletions(-) diff --git a/dlls/msvcp110/msvcp110.spec b/dlls/msvcp110/msvcp110.spec index 17e8531..0627aed 100644 --- a/dlls/msvcp110/msvcp110.spec +++ b/dlls/msvcp110/msvcp110.spec @@ -1643,8 +1643,8 @@ @ cdecl -arch=win64 ?_New_Locimp(a)_Locimp@locale(a)std@@CAPEAV123(a)_N@Z(long) locale__Locimp__New_Locimp_transparent @ cdecl -arch=win32 ?_Open_dir(a)sys@tr2(a)std@@YAPAXPADPBDAAHAAW4file_type(a)123@@Z(ptr str long long) tr2_sys__Open_dir @ cdecl -arch=win64 ?_Open_dir(a)sys@tr2(a)std@@YAPEAXAEAY0BAE(a)DPEBDAEAHAEAW4file_type@123@@Z(ptr str long long) tr2_sys__Open_dir -@ stub -arch=win32 ?_Open_dir(a)sys@tr2(a)std@@YAPAXPA_WPB_WAAHAAW4file_type(a)123@@Z -@ stub -arch=win64 ?_Open_dir(a)sys@tr2(a)std@@YAPEAXPEA_WPEB_WAEAHAEAW4file_type(a)123@@Z +@ cdecl -arch=win32 ?_Open_dir(a)sys@tr2(a)std@@YAPAXPA_WPB_WAAHAAW4file_type(a)123@@Z(ptr wstr long long) tr2_sys__Open_dir_wchar +@ cdecl -arch=win64 ?_Open_dir(a)sys@tr2(a)std@@YAPEAXPEA_WPEB_WAEAHAEAW4file_type(a)123@@Z(ptr wstr long long) tr2_sys__Open_dir_wchar @ cdecl -arch=arm ?_Orphan_all(a)_Container_base0@std@@QAAXXZ(ptr) Container_base0_Orphan_all @ thiscall -arch=i386 ?_Orphan_all(a)_Container_base0@std@@QAEXXZ(ptr) Container_base0_Orphan_all @ cdecl -arch=win64 ?_Orphan_all(a)_Container_base0@std@@QEAAXXZ(ptr) Container_base0_Orphan_all diff --git a/dlls/msvcp120/msvcp120.spec b/dlls/msvcp120/msvcp120.spec index 0146719..a2b82cb 100644 --- a/dlls/msvcp120/msvcp120.spec +++ b/dlls/msvcp120/msvcp120.spec @@ -1604,8 +1604,8 @@ @ cdecl -arch=win64 ?_New_Locimp(a)_Locimp@locale(a)std@@CAPEAV123(a)_N@Z(long) locale__Locimp__New_Locimp_transparent @ cdecl -arch=win32 ?_Open_dir(a)sys@tr2(a)std@@YAPAXAAY0BAE(a)DPBDAAHAAW4file_type@123@@Z(ptr str long long) tr2_sys__Open_dir @ cdecl -arch=win64 ?_Open_dir(a)sys@tr2(a)std@@YAPEAXAEAY0BAE(a)DPEBDAEAHAEAW4file_type@123@@Z(ptr str long long) tr2_sys__Open_dir -@ stub -arch=win32 ?_Open_dir(a)sys@tr2(a)std@@YAPAXAAY0BAE(a)_WPB_WAAHAAW4file_type@123@@Z -@ stub -arch=win64 ?_Open_dir(a)sys@tr2(a)std@@YAPEAXAEAY0BAE(a)_WPEB_WAEAHAEAW4file_type@123@@Z +@ cdecl -arch=win32 ?_Open_dir(a)sys@tr2(a)std@@YAPAXAAY0BAE(a)_WPB_WAAHAAW4file_type@123@@Z(ptr wstr long long) tr2_sys__Open_dir_wchar +@ cdecl -arch=win64 ?_Open_dir(a)sys@tr2(a)std@@YAPEAXAEAY0BAE(a)_WPEB_WAEAHAEAW4file_type@123@@Z(ptr wstr long long) tr2_sys__Open_dir_wchar @ cdecl -arch=arm ?_Orphan_all(a)_Container_base0@std@@QAAXXZ(ptr) Container_base0_Orphan_all @ thiscall -arch=i386 ?_Orphan_all(a)_Container_base0@std@@QAEXXZ(ptr) Container_base0_Orphan_all @ cdecl -arch=win64 ?_Orphan_all(a)_Container_base0@std@@QEAAXXZ(ptr) Container_base0_Orphan_all diff --git a/dlls/msvcp120_app/msvcp120_app.spec b/dlls/msvcp120_app/msvcp120_app.spec index 70fa429..be11ca1 100644 --- a/dlls/msvcp120_app/msvcp120_app.spec +++ b/dlls/msvcp120_app/msvcp120_app.spec @@ -1604,8 +1604,8 @@ @ cdecl -arch=win64 ?_New_Locimp(a)_Locimp@locale(a)std@@CAPEAV123(a)_N@Z(long) msvcp120.?_New_Locimp(a)_Locimp@locale(a)std@@CAPEAV123(a)_N@Z @ cdecl -arch=win32 ?_Open_dir(a)sys@tr2(a)std@@YAPAXAAY0BAE(a)DPBDAAHAAW4file_type@123@@Z(ptr str long long) msvcp120.?_Open_dir(a)sys@tr2(a)std@@YAPAXAAY0BAE(a)DPBDAAHAAW4file_type@123@@Z @ cdecl -arch=win64 ?_Open_dir(a)sys@tr2(a)std@@YAPEAXAEAY0BAE(a)DPEBDAEAHAEAW4file_type@123@@Z(ptr str long long) msvcp120.?_Open_dir(a)sys@tr2(a)std@@YAPEAXAEAY0BAE(a)DPEBDAEAHAEAW4file_type@123@@Z -@ stub -arch=win32 ?_Open_dir(a)sys@tr2(a)std@@YAPAXAAY0BAE(a)_WPB_WAAHAAW4file_type@123@@Z -@ stub -arch=win64 ?_Open_dir(a)sys@tr2(a)std@@YAPEAXAEAY0BAE(a)_WPEB_WAEAHAEAW4file_type@123@@Z +@ cdecl -arch=win32 ?_Open_dir(a)sys@tr2(a)std@@YAPAXAAY0BAE(a)_WPB_WAAHAAW4file_type@123@@Z(ptr wstr long long) msvcp120.?_Open_dir(a)sys@tr2(a)std@@YAPAXAAY0BAE(a)_WPB_WAAHAAW4file_type@123@@Z +@ cdecl -arch=win64 ?_Open_dir(a)sys@tr2(a)std@@YAPEAXAEAY0BAE(a)_WPEB_WAEAHAEAW4file_type@123@@Z(ptr wstr long long) msvcp120.?_Open_dir(a)sys@tr2(a)std@@YAPEAXAEAY0BAE(a)_WPEB_WAEAHAEAW4file_type@123@@Z @ cdecl -arch=arm ?_Orphan_all(a)_Container_base0@std@@QAAXXZ(ptr) msvcp120.?_Orphan_all(a)_Container_base0@std@@QAAXXZ @ thiscall -arch=i386 ?_Orphan_all(a)_Container_base0@std@@QAEXXZ(ptr) msvcp120.?_Orphan_all(a)_Container_base0@std@@QAEXXZ @ cdecl -arch=win64 ?_Orphan_all(a)_Container_base0@std@@QEAAXXZ(ptr) msvcp120.?_Orphan_all(a)_Container_base0@std@@QEAAXXZ diff --git a/dlls/msvcp140/msvcp140.spec b/dlls/msvcp140/msvcp140.spec index c75f8dd..faf0578 100644 --- a/dlls/msvcp140/msvcp140.spec +++ b/dlls/msvcp140/msvcp140.spec @@ -3689,7 +3689,7 @@ @ stub _Mtxlock @ stub _Mtxunlock @ extern _Nan _Nan -@ stub _Open_dir +@ cdecl _Open_dir(ptr wstr long long) tr2_sys__Open_dir_wchar @ cdecl -ret64 _Query_perf_counter() @ cdecl -ret64 _Query_perf_frequency() @ stub _Read_dir diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index 07aa651..838abf3 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -26,7 +26,9 @@ #include "msvcp90.h" #include "windef.h" #include "winbase.h" +#include "winnls.h" #include "wine/debug.h" + WINE_DEFAULT_DEBUG_CHANNEL(msvcp); #define SECSPERDAY 86400 @@ -14893,29 +14895,32 @@ void __cdecl tr2_sys__Last_write_time_set(char const* path, __int64 newtime) CloseHandle(handle); } -/* ?_Open_dir(a)sys@tr2(a)std@@YAPAXAAY0BAE(a)DPBDAAHAAW4file_type@123@@Z */ -/* ?_Open_dir(a)sys@tr2(a)std@@YAPEAXAEAY0BAE(a)DPEBDAEAHAEAW4file_type@123@@Z */ -void* __cdecl tr2_sys__Open_dir(char* target, char const* dest, int* err_code, enum file_type* type) +/* ??_Open_dir(a)sys@tr2(a)std@@YAPAXPA_WPB_WAAHAAW4file_type(a)123@@Z */ +/* ??_Open_dir(a)sys@tr2(a)std@@YAPEAXPEA_WPEB_WAEAHAEAW4file_type(a)123@@Z */ +void* __cdecl tr2_sys__Open_dir_wchar(wchar_t* target, wchar_t const* dest, int* err_code, enum file_type* type) { HANDLE handle; - WIN32_FIND_DATAA data; - char temppath[MAX_PATH]; - - TRACE("(%p %s %p %p)\n", target, debugstr_a(dest), err_code, type); - if(strlen(dest) > MAX_PATH - 3) { + WIN32_FIND_DATAW data; + wchar_t temppath[MAX_PATH]; + static const wchar_t dot[] = {'.', 0}; + static const wchar_t dotdot[] = {'.', '.', 0}; + static const wchar_t asterisk[] = {'\\', '*', 0}; + + TRACE("(%p %s %p %p)\n", target, debugstr_w(dest), err_code, type); + if(wcslen(dest) > MAX_PATH - 3) { *err_code = ERROR_BAD_PATHNAME; return NULL; } - strcpy(temppath, dest); - strcat(temppath, "\\*"); + wcscpy(temppath, dest); + wcscat(temppath, asterisk); - handle = FindFirstFileA(temppath, &data); + handle = FindFirstFileW(temppath, &data); if(handle == INVALID_HANDLE_VALUE) { *err_code = GetLastError(); return NULL; } - while(!strcmp(data.cFileName, ".") || !strcmp(data.cFileName, "..")) { - if(!FindNextFileA(handle, &data)) { + while(!wcscmp(data.cFileName, dot) || !wcscmp(data.cFileName, dotdot)) { + if(!FindNextFileW(handle, &data)) { *err_code = ERROR_SUCCESS; *type = status_unknown; FindClose(handle); @@ -14923,7 +14928,7 @@ void* __cdecl tr2_sys__Open_dir(char* target, char const* dest, int* err_code, e } } - strcpy(target, data.cFileName); + wcscpy(target, data.cFileName); *err_code = ERROR_SUCCESS; if(data.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) *type = directory_file; @@ -14932,6 +14937,31 @@ void* __cdecl tr2_sys__Open_dir(char* target, char const* dest, int* err_code, e return handle; } +/* ?_Open_dir(a)sys@tr2(a)std@@YAPAXAAY0BAE(a)DPBDAAHAAW4file_type@123@@Z */ +/* ?_Open_dir(a)sys@tr2(a)std@@YAPEAXAEAY0BAE(a)DPEBDAEAHAEAW4file_type@123@@Z */ +void* __cdecl tr2_sys__Open_dir(char* target, char const* dest, int* err_code, enum file_type* type) +{ + void *handle; + wchar_t target_w[MAX_PATH]; + wchar_t dest_w[MAX_PATH]; + + TRACE("(%p %s %p %p)\n", target, debugstr_a(dest), err_code, type); + + if (dest && !MultiByteToWideChar(CP_ACP, 0, dest, -1, dest_w, MAX_PATH)) + { + WARN("Failed to convert input string.\n"); + *err_code = ERROR_BAD_PATHNAME; + return NULL; + } + + handle = tr2_sys__Open_dir_wchar(target_w, dest ? dest_w : NULL, err_code, type); + + if (handle) + WideCharToMultiByte(CP_ACP, 0, target_w, -1, target, MAX_PATH, NULL, NULL); + + return handle; +} + /* ?_Read_dir(a)sys@tr2(a)std@@YAPADAAY0BAE(a)DPAXAAW4file_type@123@@Z */ /* ?_Read_dir(a)sys@tr2(a)std@@YAPEADAEAY0BAE(a)DPEAXAEAW4file_type@123@@Z */ char* __cdecl tr2_sys__Read_dir(char* target, void* handle, enum file_type* type)

1 0

Stefan Dösinger : msvcp: Implement the wchar version of _Read_dir.
by Alexandre Julliard 22 May '17

22 May '17

Module: wine Branch: master Commit: 3ddbd236d0363a8ea8753f70b4e74a0fc2cfae3c URL: http://source.winehq.org/git/wine.git/?a=commit;h=3ddbd236d0363a8ea8753f70b… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon May 22 15:59:45 2017 +0200 msvcp: Implement the wchar version of _Read_dir. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp110/msvcp110.spec | 4 ++-- dlls/msvcp120/msvcp120.spec | 4 ++-- dlls/msvcp120_app/msvcp120_app.spec | 4 ++-- dlls/msvcp140/msvcp140.spec | 2 +- dlls/msvcp90/ios.c | 28 +++++++++++++++++++++------- 5 files changed, 28 insertions(+), 14 deletions(-) diff --git a/dlls/msvcp110/msvcp110.spec b/dlls/msvcp110/msvcp110.spec index 0627aed..4001b68 100644 --- a/dlls/msvcp110/msvcp110.spec +++ b/dlls/msvcp110/msvcp110.spec @@ -1713,8 +1713,8 @@ @ cdecl ?_Random_device(a)std@@YAIXZ() _Random_device @ cdecl -arch=win32 ?_Read_dir(a)sys@tr2(a)std@@YAPADPADPAXAAW4file_type(a)123@@Z(ptr ptr ptr) tr2_sys__Read_dir @ cdecl -arch=win64 ?_Read_dir(a)sys@tr2(a)std@@YAPEADPEADPEAXAEAW4file_type(a)123@@Z(ptr ptr ptr) tr2_sys__Read_dir -@ stub -arch=win32 ?_Read_dir(a)sys@tr2(a)std@@YAPA_WPA_WPAXAAW4file_type(a)123@@Z -@ stub -arch=win64 ?_Read_dir(a)sys@tr2(a)std@@YAPEA_WPEA_WPEAXAEAW4file_type(a)123@@Z +@ cdecl -arch=win32 ?_Read_dir(a)sys@tr2(a)std@@YAPA_WPA_WPAXAAW4file_type(a)123@@Z(ptr ptr ptr) tr2_sys__Read_dir_wchar +@ cdecl -arch=win64 ?_Read_dir(a)sys@tr2(a)std@@YAPEA_WPEA_WPEAXAEAW4file_type(a)123@@Z(ptr ptr ptr) tr2_sys__Read_dir_wchar @ cdecl -arch=arm ?_Release(a)_Pad@std@@QAAXXZ(ptr) _Pad__Release @ thiscall -arch=i386 ?_Release(a)_Pad@std@@QAEXXZ(ptr) _Pad__Release @ cdecl -arch=win64 ?_Release(a)_Pad@std@@QEAAXXZ(ptr) _Pad__Release diff --git a/dlls/msvcp120/msvcp120.spec b/dlls/msvcp120/msvcp120.spec index a2b82cb..7cd3514 100644 --- a/dlls/msvcp120/msvcp120.spec +++ b/dlls/msvcp120/msvcp120.spec @@ -1674,8 +1674,8 @@ @ cdecl ?_Random_device(a)std@@YAIXZ() _Random_device @ cdecl -arch=win32 ?_Read_dir(a)sys@tr2(a)std@@YAPADAAY0BAE(a)DPAXAAW4file_type@123@@Z(ptr ptr ptr) tr2_sys__Read_dir @ cdecl -arch=win64 ?_Read_dir(a)sys@tr2(a)std@@YAPEADAEAY0BAE(a)DPEAXAEAW4file_type@123@@Z(ptr ptr ptr) tr2_sys__Read_dir -@ stub -arch=win32 ?_Read_dir(a)sys@tr2(a)std@@YAPA_WAAY0BAE(a)_WPAXAAW4file_type@123@@Z -@ stub -arch=win64 ?_Read_dir(a)sys@tr2(a)std@@YAPEA_WAEAY0BAE(a)_WPEAXAEAW4file_type@123@@Z +@ cdecl -arch=win32 ?_Read_dir(a)sys@tr2(a)std@@YAPA_WAAY0BAE(a)_WPAXAAW4file_type@123@@Z(ptr ptr ptr) tr2_sys__Read_dir_wchar +@ cdecl -arch=win64 ?_Read_dir(a)sys@tr2(a)std@@YAPEA_WAEAY0BAE(a)_WPEAXAEAW4file_type@123@@Z(ptr ptr ptr) tr2_sys__Read_dir_wchar @ cdecl -arch=arm ?_Release(a)_Pad@std@@QAAXXZ(ptr) _Pad__Release @ thiscall -arch=i386 ?_Release(a)_Pad@std@@QAEXXZ(ptr) _Pad__Release @ cdecl -arch=win64 ?_Release(a)_Pad@std@@QEAAXXZ(ptr) _Pad__Release diff --git a/dlls/msvcp120_app/msvcp120_app.spec b/dlls/msvcp120_app/msvcp120_app.spec index be11ca1..6a74f84 100644 --- a/dlls/msvcp120_app/msvcp120_app.spec +++ b/dlls/msvcp120_app/msvcp120_app.spec @@ -1674,8 +1674,8 @@ @ cdecl ?_Random_device(a)std@@YAIXZ() msvcp120.?_Random_device(a)std@@YAIXZ @ cdecl -arch=win32 ?_Read_dir(a)sys@tr2(a)std@@YAPADAAY0BAE(a)DPAXAAW4file_type@123@@Z(ptr ptr ptr) msvcp120.?_Read_dir(a)sys@tr2(a)std@@YAPADAAY0BAE(a)DPAXAAW4file_type@123@@Z @ cdecl -arch=win64 ?_Read_dir(a)sys@tr2(a)std@@YAPEADAEAY0BAE(a)DPEAXAEAW4file_type@123@@Z(ptr ptr ptr) msvcp120.?_Read_dir(a)sys@tr2(a)std@@YAPEADAEAY0BAE(a)DPEAXAEAW4file_type@123@@Z -@ stub -arch=win32 ?_Read_dir(a)sys@tr2(a)std@@YAPA_WAAY0BAE(a)_WPAXAAW4file_type@123@@Z -@ stub -arch=win64 ?_Read_dir(a)sys@tr2(a)std@@YAPEA_WAEAY0BAE(a)_WPEAXAEAW4file_type@123@@Z +@ cdecl -arch=win32 ?_Read_dir(a)sys@tr2(a)std@@YAPA_WAAY0BAE(a)_WPAXAAW4file_type@123@@Z(ptr ptr ptr) msvcp120.?_Read_dir(a)sys@tr2(a)std@@YAPA_WAAY0BAE(a)_WPAXAAW4file_type@123@@Z +@ cdecl -arch=win64 ?_Read_dir(a)sys@tr2(a)std@@YAPEA_WAEAY0BAE(a)_WPEAXAEAW4file_type@123@@Z(ptr ptr ptr) msvcp120.?_Read_dir(a)sys@tr2(a)std@@YAPEA_WAEAY0BAE(a)_WPEAXAEAW4file_type@123@@Z @ cdecl -arch=arm ?_Release(a)_Pad@std@@QAAXXZ(ptr) msvcp120.?_Release(a)_Pad@std@@QAAXXZ @ thiscall -arch=i386 ?_Release(a)_Pad@std@@QAEXXZ(ptr) msvcp120.?_Release(a)_Pad@std@@QAEXXZ @ cdecl -arch=win64 ?_Release(a)_Pad@std@@QEAAXXZ(ptr) msvcp120.?_Release(a)_Pad@std@@QEAAXXZ diff --git a/dlls/msvcp140/msvcp140.spec b/dlls/msvcp140/msvcp140.spec index faf0578..d5cedf9 100644 --- a/dlls/msvcp140/msvcp140.spec +++ b/dlls/msvcp140/msvcp140.spec @@ -3692,7 +3692,7 @@ @ cdecl _Open_dir(ptr wstr long long) tr2_sys__Open_dir_wchar @ cdecl -ret64 _Query_perf_counter() @ cdecl -ret64 _Query_perf_frequency() -@ stub _Read_dir +@ cdecl _Read_dir(ptr ptr ptr) tr2_sys__Read_dir_wchar @ stub _Remove_dir @ stub _Rename @ stub _Resize diff --git a/dlls/msvcp90/ios.c b/dlls/msvcp90/ios.c index 838abf3..8e3376c 100644 --- a/dlls/msvcp90/ios.c +++ b/dlls/msvcp90/ios.c @@ -14962,23 +14962,25 @@ void* __cdecl tr2_sys__Open_dir(char* target, char const* dest, int* err_code, e return handle; } -/* ?_Read_dir(a)sys@tr2(a)std@@YAPADAAY0BAE(a)DPAXAAW4file_type@123@@Z */ -/* ?_Read_dir(a)sys@tr2(a)std@@YAPEADAEAY0BAE(a)DPEAXAEAW4file_type@123@@Z */ -char* __cdecl tr2_sys__Read_dir(char* target, void* handle, enum file_type* type) +/* ??_Read_dir(a)sys@tr2(a)std@@YAPA_WPA_WPAXAAW4file_type(a)123@@Z */ +/* ??_Read_dir(a)sys@tr2(a)std@@YAPEA_WPEA_WPEAXAEAW4file_type(a)123@@Z */ +wchar_t* __cdecl tr2_sys__Read_dir_wchar(wchar_t* target, void* handle, enum file_type* type) { - WIN32_FIND_DATAA data; + WIN32_FIND_DATAW data; + static const wchar_t dot[] = {'.', 0}; + static const wchar_t dotdot[] = {'.', '.', 0}; TRACE("(%p %p %p)\n", target, handle, type); do { - if(!FindNextFileA(handle, &data)) { + if(!FindNextFileW(handle, &data)) { *type = status_unknown; *target = '\0'; return target; } - } while(!strcmp(data.cFileName, ".") || !strcmp(data.cFileName, "..")); + } while(!wcscmp(data.cFileName, dot) || !wcscmp(data.cFileName, dotdot)); - strcpy(target, data.cFileName); + wcscpy(target, data.cFileName); if(data.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) *type = directory_file; else @@ -14986,6 +14988,18 @@ char* __cdecl tr2_sys__Read_dir(char* target, void* handle, enum file_type* type return target; } +/* ?_Read_dir(a)sys@tr2(a)std@@YAPADAAY0BAE(a)DPAXAAW4file_type@123@@Z */ +/* ?_Read_dir(a)sys@tr2(a)std@@YAPEADAEAY0BAE(a)DPEAXAEAW4file_type@123@@Z */ +char* __cdecl tr2_sys__Read_dir(char* target, void* handle, enum file_type* type) +{ + wchar_t target_w[MAX_PATH]; + + tr2_sys__Read_dir_wchar(target_w, handle, type); + WideCharToMultiByte(CP_ACP, 0, target_w, -1, target, MAX_PATH, NULL, NULL); + + return target; +} + /* ?_Close_dir(a)sys@tr2(a)std@@YAXPAX(a)Z */ /* ?_Close_dir(a)sys@tr2(a)std@@YAXPEAX(a)Z */ void __cdecl tr2_sys__Close_dir(void* handle)

1 0

Stefan Dösinger : msvcp140: Implement _Close_dir.
by Alexandre Julliard 22 May '17

22 May '17

Module: wine Branch: master Commit: b21ca1887f13a70f8c1b805b9f8a6de5ecb1b6ea URL: http://source.winehq.org/git/wine.git/?a=commit;h=b21ca1887f13a70f8c1b805b9… Author: Stefan Dösinger <stefan(a)codeweavers.com> Date: Mon May 22 15:59:46 2017 +0200 msvcp140: Implement _Close_dir. Signed-off-by: Stefan Dösinger <stefan(a)codeweavers.com> Signed-off-by: Piotr Caban <piotr(a)codeweavers.com> Signed-off-by: Alexandre Julliard <julliard(a)winehq.org> --- dlls/msvcp140/msvcp140.spec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dlls/msvcp140/msvcp140.spec b/dlls/msvcp140/msvcp140.spec index d5cedf9..ee01b42 100644 --- a/dlls/msvcp140/msvcp140.spec +++ b/dlls/msvcp140/msvcp140.spec @@ -3620,7 +3620,7 @@ @ thiscall -ret64 -arch=i386 ?xsputn@?$basic_streambuf(a)_WU?$char_traits(a)_W@std@@@std@@MAE_JPB_W_J(a)Z(ptr wstr int64) basic_streambuf_wchar_xsputn @ cdecl -arch=win64 ?xsputn@?$basic_streambuf(a)_WU?$char_traits(a)_W@std@@@std@@MEAA_JPEB_W_J(a)Z(ptr ptr long) basic_streambuf_wchar_xsputn @ stub _Chmod -@ stub _Close_dir +@ cdecl _Close_dir(ptr) tr2_sys__Close_dir @ cdecl _Cnd_broadcast(ptr) @ cdecl _Cnd_destroy(ptr) @ cdecl _Cnd_destroy_in_situ(ptr)

1 0